todo: Suggestion for UUIDs in /etc/fstab (thanks Joshua Daniel Franklin).

[libguestfs.git] / daemon / umask.c

diff --git a/daemon/umask.c b/daemon/umask.c
index 22d2cc9..52e854e 100644 (file)
--- a/daemon/umask.c
+++ b/daemon/umask.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
@@ -35,6 +35,11 @@ do_umask (int mask)
 {
   int r;
 
+  if (mask < 0 || mask > 0777) {
+    reply_with_error ("0%o: mask negative or out of range", mask);
+    return -1;
+  }
+
   r = umask (mask);
 
   if (r == -1) {
@@ -44,3 +49,20 @@ do_umask (int mask)
 
   return r;
 }
+
+int
+do_get_umask (void)
+{
+  int r;
+
+  r = umask (022);
+  if (r == -1) {
+    reply_with_perror ("umask");
+    return -1;
+  }
+
+  /* Restore the umask, since the call above corrupted it. */
+  umask (r);
+
+  return r;
+}