Make cmdline_auth_info private to lib/popt_common.c. Provide

accessor functions.
Jeremy.
(This used to be commit 420195dd3e8b1b6771ab8be8bc974edaafc0cf8f)

1 files changed, 4 insertions, 14 deletions

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index e29929aac6c..d454a798acc 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -399,7 +399,7 @@ static void get_password_file(void)
 	}
 }
 
-static void get_credentials_file(const char *file, struct user_auth_info *info)
+static void get_credentials_file(const char *file)
 {
 	XFILE *auth;
 	fstring buf;
@@ -442,18 +442,9 @@ static void get_credentials_file(const char *file, struct user_auth_info *info)
 			val++;
 
 		if (strwicmp("password", param) == 0) {
-			SAFE_FREE(info->password);
-			info->password = SMB_STRDUP(val);
-			if (!info->password) {
-				exit(ENOMEM);
-			}
-			info->got_pass = True;
+			set_cmdline_auth_info_password(val);
 		} else if (strwicmp("username", param) == 0) {
-			SAFE_FREE(info->username);
-			info->username = SMB_STRDUP(val);
-			if (!info->username) {
-				exit(ENOMEM);
-			}
+			set_cmdline_auth_info_username(val);
 		} else if (strwicmp("domain", param) == 0) {
 			set_global_myworkgroup(val);
 		}
@@ -509,8 +500,7 @@ static void popt_common_credentials_callback(poptContext con,
 		}
 
 		if (getenv("PASSWD_FD") || getenv("PASSWD_FILE")) {
-			get_password_file(&cmdline_auth_info);
-			cmdline_auth_info.got_pass = True;
+			get_password_file();
 		}
 
 		return;