Changeset 745 for trunk/server/source3/utils/net_afs.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_afs.c (modified) (4 diffs)

trunk/server/source3/utils/net_afs.c

@@ -20 +20 @@
 #include "includes.h"
 #include "utils/net.h"
+#include "secrets.h"
+#include "system/filesys.h"
 
 int net_afs_usage(struct net_context *c, int argc, const char **argv)
@@ -36 +38 @@
 
         if (argc != 2) {
-                d_printf(_("Usage:")," net afs key <keyfile> cell\n");
+                d_printf("%s net afs key <keyfile> cell\n", _("Usage:"));
                 return -1;
         }
@@ -52 +54 @@
         if (read(fd, &keyfile, sizeof(keyfile)) != sizeof(keyfile)) {
                 d_fprintf(stderr, _("Could not read keyfile\n"));
+                close(fd);
                 return -1;
         }
+        close(fd);
 
         if (!secrets_store_afs_keyfile(argv[1], &keyfile)) {
@@ -69 +73 @@
 
         if (argc != 2) {
-                fprintf(stderr, _("Usage:")," net afs impersonate <user> <cell>\n");
+                d_fprintf(stderr, "%s net afs impersonate <user> <cell>\n",
+                          _("Usage:"));
                 exit(1);
         }