Author: jelmer Date: 2007-12-03 23:33:09 +0000 (Mon, 03 Dec 2007) New Revision: 26270
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26270 Log: Require specifying the loadparm_context or NULL to cli_credentials_guess(). Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/credentials/credentials.c branches/SAMBA_4_0/source/auth/credentials/credentials.i branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.h branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_wrap.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c branches/SAMBA_4_0/source/torture/gentest.c branches/SAMBA_4_0/source/torture/locktest.c branches/SAMBA_4_0/source/torture/masktest.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.c =================================================================== --- branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -635,11 +635,14 @@ * * @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); Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.i =================================================================== --- branches/SAMBA_4_0/source/auth/credentials/credentials.i 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/auth/credentials/credentials.i 2007-12-03 23:33:09 UTC (rev 26270) @@ -85,7 +85,7 @@ bool set_workstation(const char *workstation, enum credentials_obtained obtained=CRED_SPECIFIED); - void guess(void); + void guess(struct loadparm_context *lp_ctx = NULL); bool is_anonymous(void); const struct samr_Password *get_nt_hash(TALLOC_CTX *mem_ctx); Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c =================================================================== --- branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -2459,8 +2459,9 @@ #define SWIGTYPE_p_TALLOC_CTX swig_types[0] #define SWIGTYPE_p_char swig_types[1] #define SWIGTYPE_p_cli_credentials swig_types[2] -static swig_type_info *swig_types[4]; -static swig_module_info swig_module = {swig_types, 3, 0, 0, 0, 0}; +#define SWIGTYPE_p_loadparm_context swig_types[3] +static swig_type_info *swig_types[5]; +static swig_module_info swig_module = {swig_types, 4, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3351,17 +3352,21 @@ SWIGINTERN PyObject *_wrap_Credentials_guess(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; cli_credentials *arg1 = (cli_credentials *) 0 ; + struct loadparm_context *arg2 = (struct loadparm_context *) NULL ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "lp_ctx", NULL }; { arg1 = NULL; } - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Credentials_guess",kwnames,&obj0)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:Credentials_guess",kwnames,&obj0,&obj1)) SWIG_fail; if (obj0) { res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_cli_credentials, 0 | 0 ); if (!SWIG_IsOK(res1)) { @@ -3369,7 +3374,14 @@ } arg1 = (cli_credentials *)(argp1); } - cli_credentials_guess(arg1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_loadparm_context, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Credentials_guess" "', argument " "2"" of type '" "struct loadparm_context *""'"); + } + arg2 = (struct loadparm_context *)(argp2); + } + cli_credentials_guess(arg1,arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -3548,21 +3560,25 @@ static swig_type_info _swigt__p_TALLOC_CTX = {"_p_TALLOC_CTX", "TALLOC_CTX *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cli_credentials = {"_p_cli_credentials", "struct cli_credentials *|cli_credentials *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_loadparm_context = {"_p_loadparm_context", "struct loadparm_context *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { &_swigt__p_TALLOC_CTX, &_swigt__p_char, &_swigt__p_cli_credentials, + &_swigt__p_loadparm_context, }; static swig_cast_info _swigc__p_TALLOC_CTX[] = { {&_swigt__p_TALLOC_CTX, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cli_credentials[] = { {&_swigt__p_cli_credentials, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_loadparm_context[] = { {&_swigt__p_loadparm_context, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_TALLOC_CTX, _swigc__p_char, _swigc__p_cli_credentials, + _swigc__p_loadparm_context, }; Modified: branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.h =================================================================== --- branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.h 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.h 2007-12-03 23:33:09 UTC (rev 26270) @@ -19,4 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -void cluster_ctdb_init(struct event_context *ev, const char *model); +void cluster_ctdb_init(struct loadparm_context *lp_ctx, + struct event_context *ev, const char *model); Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c =================================================================== --- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -129,7 +129,7 @@ ldb_oom(module->ldb); goto failed; } - cli_credentials_guess(creds); + cli_credentials_guess(creds, NULL); cli_credentials_set_username(creds, username, CRED_SPECIFIED); cli_credentials_set_password(creds, password, CRED_SPECIFIED); Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c =================================================================== --- branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -60,7 +60,7 @@ } if (reason == POPT_CALLBACK_REASON_POST) { - cli_credentials_guess(cmdline_credentials); + cli_credentials_guess(cmdline_credentials, NULL); if (!dont_ask) { cli_credentials_set_cmdline_callbacks(cmdline_credentials); Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c =================================================================== --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -230,8 +230,7 @@ s->io.creds = cli_credentials_init(mem_ctx); if (composite_nomem(s->io.creds, c)) return c; - cli_credentials_set_anonymous(s->io.creds); - cli_credentials_guess(s->io.creds); + cli_credentials_guess(s->io.creds, NULL); } /* send smb2 connect request */ Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_wrap.c =================================================================== --- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_wrap.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_wrap.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -2461,10 +2461,11 @@ #define SWIGTYPE_p_char swig_types[2] #define SWIGTYPE_p_cli_credentials swig_types[3] #define SWIGTYPE_p_dcerpc_pipe swig_types[4] -#define SWIGTYPE_p_p_dcerpc_pipe swig_types[5] -#define SWIGTYPE_p_uint32_t swig_types[6] -static swig_type_info *swig_types[8]; -static swig_module_info swig_module = {swig_types, 7, 0, 0, 0, 0}; +#define SWIGTYPE_p_loadparm_context swig_types[5] +#define SWIGTYPE_p_p_dcerpc_pipe swig_types[6] +#define SWIGTYPE_p_uint32_t swig_types[7] +static swig_type_info *swig_types[9]; +static swig_module_info swig_module = {swig_types, 8, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3371,17 +3372,21 @@ SWIGINTERN PyObject *_wrap_Credentials_guess(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; cli_credentials *arg1 = (cli_credentials *) 0 ; + struct loadparm_context *arg2 = (struct loadparm_context *) NULL ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "lp_ctx", NULL }; { arg1 = NULL; } - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Credentials_guess",kwnames,&obj0)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:Credentials_guess",kwnames,&obj0,&obj1)) SWIG_fail; if (obj0) { res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_cli_credentials, 0 | 0 ); if (!SWIG_IsOK(res1)) { @@ -3389,7 +3394,14 @@ } arg1 = (cli_credentials *)(argp1); } - cli_credentials_guess(arg1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_loadparm_context, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Credentials_guess" "', argument " "2"" of type '" "struct loadparm_context *""'"); + } + arg2 = (struct loadparm_context *)(argp2); + } + cli_credentials_guess(arg1,arg2); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -3678,6 +3690,7 @@ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_cli_credentials = {"_p_cli_credentials", "struct cli_credentials *|cli_credentials *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_dcerpc_pipe = {"_p_dcerpc_pipe", "struct dcerpc_pipe *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_loadparm_context = {"_p_loadparm_context", "struct loadparm_context *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_dcerpc_pipe = {"_p_p_dcerpc_pipe", "struct dcerpc_pipe **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_uint32_t = {"_p_uint32_t", "uint32_t *", 0, 0, (void*)0, 0}; @@ -3687,6 +3700,7 @@ &_swigt__p_char, &_swigt__p_cli_credentials, &_swigt__p_dcerpc_pipe, + &_swigt__p_loadparm_context, &_swigt__p_p_dcerpc_pipe, &_swigt__p_uint32_t, }; @@ -3696,6 +3710,7 @@ static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_cli_credentials[] = { {&_swigt__p_cli_credentials, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_dcerpc_pipe[] = { {&_swigt__p_dcerpc_pipe, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_loadparm_context[] = { {&_swigt__p_loadparm_context, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_dcerpc_pipe[] = { {&_swigt__p_p_dcerpc_pipe, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_uint32_t[] = { {&_swigt__p_uint32_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -3705,6 +3720,7 @@ _swigc__p_char, _swigc__p_cli_credentials, _swigc__p_dcerpc_pipe, + _swigc__p_loadparm_context, _swigc__p_p_dcerpc_pipe, _swigc__p_uint32_t, }; Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -153,7 +153,6 @@ } if (creds == NULL) { creds = cli_credentials_init(mprMemCtx()); - cli_credentials_guess(creds); cli_credentials_set_anonymous(creds); } Modified: branches/SAMBA_4_0/source/torture/gentest.c =================================================================== --- branches/SAMBA_4_0/source/torture/gentest.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/torture/gentest.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -2200,8 +2200,8 @@ servers[0].credentials = cli_credentials_init(talloc_autofree_context()); servers[1].credentials = cli_credentials_init(talloc_autofree_context()); - cli_credentials_guess(servers[0].credentials); - cli_credentials_guess(servers[1].credentials); + cli_credentials_guess(servers[0].credentials, global_loadparm); + cli_credentials_guess(servers[1].credentials, global_loadparm); options.seed = time(NULL); options.numops = 1000; Modified: branches/SAMBA_4_0/source/torture/locktest.c =================================================================== --- branches/SAMBA_4_0/source/torture/locktest.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/torture/locktest.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -565,8 +565,8 @@ servers[0] = cli_credentials_init(talloc_autofree_context()); servers[1] = cli_credentials_init(talloc_autofree_context()); - cli_credentials_guess(servers[0]); - cli_credentials_guess(servers[1]); + cli_credentials_guess(servers[0], global_loadparm); + cli_credentials_guess(servers[1], global_loadparm); seed = time(NULL); Modified: branches/SAMBA_4_0/source/torture/masktest.c =================================================================== --- branches/SAMBA_4_0/source/torture/masktest.c 2007-12-03 23:32:59 UTC (rev 26269) +++ branches/SAMBA_4_0/source/torture/masktest.c 2007-12-03 23:33:09 UTC (rev 26270) @@ -305,7 +305,7 @@ lp_load(dyn_CONFIGFILE); credentials = cli_credentials_init(talloc_autofree_context()); - cli_credentials_guess(credentials); + cli_credentials_guess(credentials, global_loadparm); seed = time(NULL);
