[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1722-gcf671ca

[Kai Blin]

The branch, v3-2-test has been updated
       via  cf671ca35bff09af56c67e789a86a3b86093b5fb (commit)
      from  1a1c7954368a7f168a57f86f4f857cf70258e37a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit cf671ca35bff09af56c67e789a86a3b86093b5fb
Author: Kai Blin <[EMAIL PROTECTED]>
Date:   Thu Jan 31 09:42:03 2008 +0100

    ntlm_auth: Parse configfile after parsing it's location, not before.

-----------------------------------------------------------------------

Summary of changes:
 source/utils/ntlm_auth.c |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index 3e2093a..a3a403d 100644
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -2322,7 +2322,8 @@ enum {
                { "use-cached-creds", 0, POPT_ARG_NONE, &use_cached_creds, 
OPT_USE_CACHED_CREDS, "Use cached credentials if no password is given"},
                { "diagnostics", 0, POPT_ARG_NONE, &diagnostics, 
OPT_DIAGNOSTICS, "Perform diagnostics on the authentictaion chain"},
                { "require-membership-of", 0, POPT_ARG_STRING, 
&require_membership_of, OPT_REQUIRE_MEMBERSHIP, "Require that a user be a 
member of this group (either name or SID) for authentication to succeed" },
-               POPT_COMMON_SAMBA
+               POPT_COMMON_CONFIGFILE
+               POPT_COMMON_VERSION
                POPT_TABLEEND
        };
 
@@ -2330,14 +2331,6 @@ enum {
        load_case_tables();
 
        dbf = x_stderr;
-       
-       /* Samba client initialisation */
-
-       if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) {
-               d_fprintf(stderr, "ntlm_auth: error opening config file %s. 
Error was %s\n",
-                       get_dyn_CONFIGFILE(), strerror(errno));
-               exit(1);
-       }
 
        /* Parse options */
 
@@ -2350,6 +2343,18 @@ enum {
                return 1;
        }
 
+       while((opt = poptGetNextOpt(pc)) != -1) {
+               /* Get generic config options like --configfile */
+       }
+
+       poptFreeContext(pc);
+
+       if (!lp_load(get_dyn_CONFIGFILE(), True, False, False, True)) {
+               d_fprintf(stderr, "ntlm_auth: error opening config file %s. 
Error was %s\n",
+                       get_dyn_CONFIGFILE(), strerror(errno));
+               exit(1);
+       }
+
        pc = poptGetContext(NULL, argc, (const char **)argv, long_options, 
                            POPT_CONTEXT_KEEP_FIRST);
 


-- 
Samba Shared Repository