r17984: Ensure we never indirect a null opt_username if it wasn't

specified.
Jeremy.
(This used to be commit 5d9bb91ab7bb080b56b25849e646143ab3ad8252)

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 916763ad212564023bbaa0fd2646df302d0f7251..39b511ca4e7a03d42f6ee804124d85efa65893f0 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -811,6 +811,11 @@ static void manage_client_ntlmssp_request(enum stdio_helper_mode stdio_helper_mo
        NTSTATUS nt_status;
        BOOL first = False;
        
+       if (!opt_username || !*opt_username) {
+               x_fprintf(x_stderr, "username must be specified!\n\n");
+               exit(1);
+       }
+
        if (strlen(buf) < 2) {
                DEBUG(1, ("NTLMSSP query [%s] invalid", buf));
                x_fprintf(x_stdout, "BH\n");
@@ -1506,6 +1511,11 @@ static void manage_gss_spnego_client_request(enum stdio_helper_mode stdio_helper
        SPNEGO_DATA spnego;
        ssize_t len;
 
+       if (!opt_username || !*opt_username) {
+               x_fprintf(x_stderr, "username must be specified!\n\n");
+               exit(1);
+       }
+
        if (strlen(buf) <= 3) {
                DEBUG(1, ("SPNEGO query [%s] too short\n", buf));
                x_fprintf(x_stdout, "BH\n");