r26270: Require specifying the loadparm_context or NULL to cli_credentials_guess().

[abartlet/samba.git/.git] / source4 / auth / credentials / credentials.c

diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 0c5f5b0f3bbe79eae7bcfd07e22a4a5a359b2d77..1889731781fb9c6c6d3f940b0c0938825a5ee188 100644 (file)
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -635,11 +635,14 @@ void cli_credentials_set_conf(struct cli_credentials *cred,
  * 
  * @param cred Credentials structure to fill in
  */
-void cli_credentials_guess(struct cli_credentials *cred)
+void cli_credentials_guess(struct cli_credentials *cred,
+                          struct loadparm_context *lp_ctx)
 {
        char *p;
 
-       cli_credentials_set_conf(cred, global_loadparm);
+       if (lp_ctx != NULL) {
+               cli_credentials_set_conf(cred, global_loadparm);
+       }
        
        if (getenv("LOGNAME")) {
                cli_credentials_set_username(cred, getenv("LOGNAME"), CRED_GUESS_ENV);