Changeset 989 for vendor/current/source3/utils/smbget.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/utils/smbget.c (modified) (2 diffs)

vendor/current/source3/utils/smbget.c

@@ -106 +106 @@
         static char *savedun;
         static char *savedpw;
-        char tmp[128];
 
         if (hasasked) {
@@ -116 +115 @@
         hasasked = true;
 
-        if (!opt.nonprompt && !opt.username_specified) {
-                printf("Username for %s at %s [guest] ", shr, srv);
-                if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
-                        return;
-                }
-                if ((strlen(tmp) > 0) && (tmp[strlen(tmp) - 1] == '\n')) {
-                        tmp[strlen(tmp) - 1] = '\0';
-                }
-                strncpy(un, tmp, unlen - 1);
-        } else if (opt.username != NULL) {
+        /*
+         * If no user has been specified un is initialized with the current
+         * username of the user who started smbget.
+         */
+        if (opt.username_specified) {
                 strncpy(un, opt.username, unlen - 1);
         }
 
-        if (!opt.nonprompt && !opt.password_specified) {
+        if (!opt.nonprompt && !opt.password_specified && pw[0] == '\0') {
                 char *prompt;
-                if (asprintf(&prompt, "Password for %s at %s: ", shr, srv) ==
-                    -1) {
+                int rc;
+
+                rc = asprintf(&prompt,
+                              "Password for [%s] connecting to //%s/%s: ",
+                              un, shr, srv);
+                if (rc == -1) {
                         return;
                 }