[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Fri Jul 16 02:24:43 MDT 2010


The branch, master has been updated
       via  6b266b8... s4-loadparm: 2nd half of lp_ to lpcfg_ conversion
       via  e4c35c5... s4-loadparm: change lp_*() to lpcfg_*() and provide s3 compatibility lp_*()
      from  8b1980c... WHATSNEW: Start 3.6.0pre1 release notes.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6b266b85cf34145ac1f03d8f787b81121e4ec92b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Jul 16 14:32:42 2010 +1000

    s4-loadparm: 2nd half of lp_ to lpcfg_ conversion
    
    this converts all callers that use the Samba4 loadparm lp_ calling
    convention to use the lpcfg_ prefix.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

commit e4c35c5a09dd66c9280caa39130b7e3b941b7e51
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Jul 16 14:32:10 2010 +1000

    s4-loadparm: change lp_*() to lpcfg_*() and provide s3 compatibility lp_*()
    
    This patch changes all Samba4 loadparm functions that take a
    loadparm_context or a loadparm_service structure to use a lpcfg_*()
    prefix. It then creates lp_*() functions which are wrappers around the
    lpcfg_*() functions. This should allow us to mix Samba3 and Samba4
    code which uses loadparm calls.
    
    This first patch just makes the manual changes to the core loadparm
    code. The tree will not build with just this patch. The next patch
    replaces all of the callers, and was generated automatically with a
    perl script.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 lib/torture/torture.c                           |   10 +-
 lib/util/charset/tests/iconv.c                  |   10 +-
 lib/util/tests/strlist.c                        |    4 +-
 libcli/nbt/tools/nmblookup.c                    |    4 +-
 nsswitch/libwbclient/tests/wbclient.c           |    2 +-
 source4/auth/credentials/credentials.c          |    6 +-
 source4/auth/credentials/credentials_files.c    |    6 +-
 source4/auth/credentials/credentials_krb5.c     |   12 +-
 source4/auth/credentials/pycredentials.c        |   12 +-
 source4/auth/gensec/gensec.c                    |    6 +-
 source4/auth/gensec/gensec_gssapi.c             |    8 +-
 source4/auth/gensec/pygensec.c                  |    2 +-
 source4/auth/gensec/schannel.c                  |    6 +-
 source4/auth/gensec/spnego.c                    |    2 +-
 source4/auth/kerberos/krb5_init_context.c       |    4 +-
 source4/auth/ntlm/auth.c                        |   10 +-
 source4/auth/ntlm/auth_anonymous.c              |    2 +-
 source4/auth/ntlm/auth_sam.c                    |   22 +-
 source4/auth/ntlm/auth_server.c                 |   18 +-
 source4/auth/ntlm/auth_unix.c                   |   10 +-
 source4/auth/ntlm/auth_util.c                   |    6 +-
 source4/auth/ntlmssp/ntlmssp_client.c           |   10 +-
 source4/auth/ntlmssp/ntlmssp_server.c           |   10 +-
 source4/auth/pyauth.c                           |    6 +-
 source4/auth/samba_server_gensec.c              |    2 +-
 source4/auth/session.c                          |    2 +-
 source4/auth/system_session.c                   |   14 +-
 source4/cldap_server/cldap_server.c             |   10 +-
 source4/cldap_server/netlogon.c                 |   20 +-
 source4/client/cifsdd.c                         |   20 +-
 source4/client/client.c                         |   22 +-
 source4/dsdb/common/util.c                      |    4 +-
 source4/dsdb/dns/dns_update.c                   |   18 +-
 source4/dsdb/kcc/kcc_deleted.c                  |    2 +-
 source4/dsdb/kcc/kcc_periodic.c                 |    2 +-
 source4/dsdb/kcc/kcc_service.c                  |    6 +-
 source4/dsdb/repl/drepl_out_helpers.c           |    2 +-
 source4/dsdb/repl/drepl_ridalloc.c              |    2 +-
 source4/dsdb/repl/drepl_service.c               |    8 +-
 source4/dsdb/samdb/ldb_modules/acl.c            |    2 +-
 source4/dsdb/samdb/ldb_modules/kludge_acl.c     |    2 +-
 source4/dsdb/samdb/ldb_modules/partition.c      |    2 +-
 source4/dsdb/samdb/ldb_modules/password_hash.c  |   12 +-
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |    2 +-
 source4/dsdb/samdb/ldb_modules/ridalloc.c       |    2 +-
 source4/dsdb/samdb/ldb_modules/samba3sid.c      |    2 +-
 source4/dsdb/samdb/ldb_modules/samldb.c         |    2 +-
 source4/dsdb/samdb/samdb.c                      |    8 +-
 source4/dsdb/samdb/samdb_privilege.c            |    2 +-
 source4/kdc/db-glue.c                           |   18 +-
 source4/kdc/kdc.c                               |   14 +-
 source4/kdc/kpasswdd.c                          |    4 +-
 source4/kdc/mit_samba.c                         |    6 +-
 source4/kdc/pac-glue.c                          |    4 +-
 source4/ldap_server/ldap_backend.c              |    6 +-
 source4/ldap_server/ldap_server.c               |   24 +-
 source4/lib/cmdline/popt_common.c               |   28 +-
 source4/lib/com/dcom/main.c                     |    4 +-
 source4/lib/ldb-samba/ldb_wrap.c                |    8 +-
 source4/lib/ldb-samba/pyldb.c                   |    2 +-
 source4/lib/messaging/pymessaging.c             |    4 +-
 source4/lib/messaging/tests/irpc.c              |    6 +-
 source4/lib/messaging/tests/messaging.c         |    6 +-
 source4/lib/policy/gp_filesys.c                 |   12 +-
 source4/lib/policy/gp_ldap.c                    |    2 +-
 source4/lib/policy/gp_manage.c                  |    2 +-
 source4/lib/registry/pyregistry.c               |    4 +-
 source4/lib/registry/samba.c                    |    2 +-
 source4/lib/socket/testsuite.c                  |    4 +-
 source4/lib/tls/tls.c                           |   16 +-
 source4/libcli/ldap/ldap_bind.c                 |    2 +-
 source4/libcli/ldap/ldap_client.c               |    8 +-
 source4/libcli/resolve/bcast.c                  |    4 +-
 source4/libcli/resolve/file.c                   |    2 +-
 source4/libcli/resolve/resolve_lp.c             |    4 +-
 source4/libcli/resolve/wins.c                   |    4 +-
 source4/libcli/smb_composite/smb_composite.h    |    2 +-
 source4/libcli/wrepl/winsrepl.c                 |    2 +-
 source4/libnet/libnet.c                         |    2 +-
 source4/libnet/libnet_become_dc.c               |   10 +-
 source4/libnet/libnet_join.c                    |    8 +-
 source4/libnet/libnet_lookup.c                  |    6 +-
 source4/libnet/libnet_samdump.c                 |    2 +-
 source4/libnet/libnet_samsync_ldb.c             |    4 +-
 source4/libnet/libnet_site.c                    |    4 +-
 source4/libnet/libnet_unbecome_dc.c             |    2 +-
 source4/libnet/libnet_vampire.c                 |   14 +-
 source4/libnet/py_net.c                         |    4 +-
 source4/librpc/rpc/dcerpc_connect.c             |   26 +-
 source4/librpc/rpc/dcerpc_schannel.c            |    2 +-
 source4/librpc/rpc/dcerpc_util.c                |    8 +-
 source4/librpc/rpc/pyrpc.c                      |    4 +-
 source4/nbt_server/dgram/netlogon.c             |   12 +-
 source4/nbt_server/dgram/ntlogon.c              |    6 +-
 source4/nbt_server/dgram/request.c              |    8 +-
 source4/nbt_server/interfaces.c                 |   16 +-
 source4/nbt_server/nbt_server.c                 |    2 +-
 source4/nbt_server/packet.c                     |    2 +-
 source4/nbt_server/query.c                      |    2 +-
 source4/nbt_server/register.c                   |   26 +-
 source4/nbt_server/wins/wins_ldb.c              |    4 +-
 source4/nbt_server/wins/winsclient.c            |   10 +-
 source4/nbt_server/wins/winsdb.c                |   10 +-
 source4/nbt_server/wins/winsserver.c            |   26 +-
 source4/nbt_server/wins/winswack.c              |    6 +-
 source4/ntp_signd/ntp_signd.c                   |    8 +-
 source4/ntptr/simple_ldb/ntptr_simple_ldb.c     |    8 +-
 source4/ntvfs/cifs/vfs_cifs.c                   |   14 +-
 source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c   |    2 +-
 source4/ntvfs/ipc/rap_server.c                  |    2 +-
 source4/ntvfs/ipc/vfs_ipc.c                     |    2 +-
 source4/ntvfs/posix/pvfs_shortname.c            |    4 +-
 source4/ntvfs/posix/vfs_posix.c                 |    2 +-
 source4/ntvfs/print/vfs_print.c                 |    2 +-
 source4/ntvfs/simple/vfs_simple.c               |    2 +-
 source4/ntvfs/smb2/vfs_smb2.c                   |   10 +-
 source4/param/generic.c                         |    8 +-
 source4/param/loadparm.c                        |  788 ++++++++++++-----------
 source4/param/param.h                           |  388 ++++++-----
 source4/param/provision.c                       |    6 +-
 source4/param/pyparam.c                         |   48 +-
 source4/param/pyparam.h                         |    2 +-
 source4/param/pyparam_util.c                    |    8 +-
 source4/param/secrets.c                         |    2 +-
 source4/param/share_classic.c                   |   74 ++--
 source4/param/share_ldb.c                       |    2 +-
 source4/param/tests/loadparm.c                  |   66 +-
 source4/param/util.c                            |   42 +-
 source4/rpc_server/common/server_info.c         |   12 +-
 source4/rpc_server/dcerpc_server.c              |   20 +-
 source4/rpc_server/dcesrv_auth.c                |    2 +-
 source4/rpc_server/drsuapi/addentry.c           |    2 +-
 source4/rpc_server/drsuapi/dcesrv_drsuapi.c     |    4 +-
 source4/rpc_server/drsuapi/drsutil.c            |    2 +-
 source4/rpc_server/drsuapi/getncchanges.c       |    8 +-
 source4/rpc_server/lsa/dcesrv_lsa.c             |   12 +-
 source4/rpc_server/lsa/lsa_init.c               |    4 +-
 source4/rpc_server/lsa/lsa_lookup.c             |    4 +-
 source4/rpc_server/netlogon/dcerpc_netlogon.c   |   32 +-
 source4/rpc_server/remote/dcesrv_remote.c       |   12 +-
 source4/rpc_server/samr/dcesrv_samr.c           |   14 +-
 source4/rpc_server/samr/samr_password.c         |   10 +-
 source4/rpc_server/service_rpc.c                |   20 +-
 source4/rpc_server/spoolss/dcesrv_spoolss.c     |   12 +-
 source4/rpc_server/srvsvc/dcesrv_srvsvc.c       |   22 +-
 source4/rpc_server/srvsvc/srvsvc_ntvfs.c        |    2 +-
 source4/rpc_server/wkssvc/dcesrv_wkssvc.c       |    2 +-
 source4/scripting/python/pyglue.c               |    4 +-
 source4/smb_server/smb/negprot.c                |   52 +-
 source4/smb_server/smb/receive.c                |    6 +-
 source4/smb_server/smb/service.c                |    2 +-
 source4/smb_server/smb/sesssetup.c              |    2 +-
 source4/smb_server/smb/signing.c                |    4 +-
 source4/smb_server/smb/trans2.c                 |   18 +-
 source4/smb_server/smb2/negprot.c               |    8 +-
 source4/smb_server/smb2/receive.c               |    2 +-
 source4/smb_server/smb_samba3.c                 |   16 +-
 source4/smb_server/smb_server.c                 |   20 +-
 source4/smbd/process_model.h                    |    4 +-
 source4/smbd/process_prefork.c                  |    4 +-
 source4/smbd/process_single.c                   |    6 +-
 source4/smbd/process_standard.c                 |    4 +-
 source4/smbd/process_thread.c                   |    6 +-
 source4/smbd/server.c                           |   14 +-
 source4/smbd/service_named_pipe.c               |    2 +-
 source4/smbd/service_stream.c                   |    6 +-
 source4/smbd/service_task.c                     |    2 +-
 source4/torture/auth/ntlmssp.c                  |    4 +-
 source4/torture/auth/pac.c                      |    2 +-
 source4/torture/basic/base.c                    |   20 +-
 source4/torture/basic/charset.c                 |    2 +-
 source4/torture/basic/misc.c                    |   58 +-
 source4/torture/basic/secleak.c                 |    6 +-
 source4/torture/gentest.c                       |   22 +-
 source4/torture/ldap/cldap.c                    |   10 +-
 source4/torture/ldap/cldapbench.c               |    6 +-
 source4/torture/libnet/domain.c                 |    2 +-
 source4/torture/libnet/groupinfo.c              |    2 +-
 source4/torture/libnet/groupman.c               |    2 +-
 source4/torture/libnet/libnet_BecomeDC.c        |    6 +-
 source4/torture/libnet/libnet_domain.c          |    8 +-
 source4/torture/libnet/libnet_group.c           |    6 +-
 source4/torture/libnet/libnet_lookup.c          |    4 +-
 source4/torture/libnet/libnet_rpc.c             |    6 +-
 source4/torture/libnet/libnet_user.c            |   16 +-
 source4/torture/libnet/userinfo.c               |    2 +-
 source4/torture/libnet/userman.c                |    6 +-
 source4/torture/local/dbspeed.c                 |    2 +-
 source4/torture/locktest.c                      |   18 +-
 source4/torture/locktest2.c                     |   12 +-
 source4/torture/masktest.c                      |   12 +-
 source4/torture/nbt/browse.c                    |    2 +-
 source4/torture/nbt/dgram.c                     |   48 +-
 source4/torture/nbt/nbt.c                       |    2 +-
 source4/torture/nbt/query.c                     |    2 +-
 source4/torture/nbt/register.c                  |    8 +-
 source4/torture/nbt/wins.c                      |   24 +-
 source4/torture/nbt/winsbench.c                 |    4 +-
 source4/torture/nbt/winsreplication.c           |   18 +-
 source4/torture/ntp/ntp_signd.c                 |    2 +-
 source4/torture/rap/sam.c                       |    6 +-
 source4/torture/raw/composite.c                 |   22 +-
 source4/torture/raw/context.c                   |   34 +-
 source4/torture/raw/lock.c                      |    6 +-
 source4/torture/raw/lockbench.c                 |   12 +-
 source4/torture/raw/openbench.c                 |   12 +-
 source4/torture/raw/oplock.c                    |   12 +-
 source4/torture/raw/samba3misc.c                |    8 +-
 source4/torture/raw/tconrate.c                  |   12 +-
 source4/torture/rpc/countcalls.c                |    2 +-
 source4/torture/rpc/drsuapi.c                   |    6 +-
 source4/torture/rpc/dssync.c                    |   36 +-
 source4/torture/rpc/frsapi.c                    |    2 +-
 source4/torture/rpc/join.c                      |   20 +-
 source4/torture/rpc/mgmt.c                      |    2 +-
 source4/torture/rpc/netlogon.c                  |   42 +-
 source4/torture/rpc/remote_pac.c                |   12 +-
 source4/torture/rpc/samba3rpc.c                 |   80 ++--
 source4/torture/rpc/samlogon.c                  |   10 +-
 source4/torture/rpc/samr.c                      |    4 +-
 source4/torture/rpc/samr_accessmask.c           |   12 +-
 source4/torture/rpc/samsync.c                   |   12 +-
 source4/torture/rpc/scanner.c                   |    2 +-
 source4/torture/rpc/schannel.c                  |   16 +-
 source4/torture/rpc/session_key.c               |    6 +-
 source4/torture/rpc/spoolss.c                   |   12 +-
 source4/torture/rpc/spoolss_access.c            |    2 +-
 source4/torture/rpc/spoolss_notify.c            |    4 +-
 source4/torture/rpc/testjoin.c                  |    6 +-
 source4/torture/rpc/wkssvc.c                    |   20 +-
 source4/torture/shell.c                         |    4 +-
 source4/torture/smb2/oplock.c                   |   10 +-
 source4/torture/smb2/scan.c                     |   18 +-
 source4/torture/smb2/util.c                     |   10 +-
 source4/torture/smbiconv.c                      |    2 +-
 source4/torture/smbtorture.c                    |  106 ++--
 source4/torture/unix/unix_info2.c               |   12 +-
 source4/torture/unix/whoami.c                   |   12 +-
 source4/torture/util_smb.c                      |   14 +-
 source4/torture/winbind/struct_based.c          |   10 +-
 source4/utils/net/net_gpo.c                     |    4 +-
 source4/utils/net/net_join.c                    |    2 +-
 source4/utils/ntlm_auth.c                       |   32 +-
 source4/web_server/web_server.c                 |   14 +-
 source4/winbind/idmap.c                         |    6 +-
 source4/winbind/wb_cmd_getpwnam.c               |    4 +-
 source4/winbind/wb_cmd_getpwuid.c               |    4 +-
 source4/winbind/wb_dom_info.c                   |    6 +-
 source4/winbind/wb_dom_info_trusted.c           |    2 +-
 source4/winbind/wb_init_domain.c                |    8 +-
 source4/winbind/wb_pam_auth.c                   |    6 +-
 source4/winbind/wb_samba3_cmd.c                 |    8 +-
 source4/winbind/wb_server.c                     |   26 +-
 source4/winbind/wb_sid2domain.c                 |    2 +-
 source4/winbind/wb_utils.c                      |    4 +-
 source4/wrepl_server/wrepl_apply_records.c      |    2 +-
 source4/wrepl_server/wrepl_in_connection.c      |   14 +-
 source4/wrepl_server/wrepl_scavenging.c         |    2 +-
 source4/wrepl_server/wrepl_server.c             |   24 +-
 259 files changed, 1935 insertions(+), 1865 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index 4333f98..71bd53b 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -450,27 +450,27 @@ bool torture_run_test(struct torture_context *context,
 int torture_setting_int(struct torture_context *test, const char *name, 
 							int default_value)
 {
-	return lp_parm_int(test->lp_ctx, NULL, "torture", name, default_value);
+	return lpcfg_parm_int(test->lp_ctx, NULL, "torture", name, default_value);
 }
 
 unsigned long torture_setting_ulong(struct torture_context *test,
 				    const char *name,
 				    unsigned long default_value)
 {
-	return lp_parm_ulong(test->lp_ctx, NULL, "torture", name,
+	return lpcfg_parm_ulong(test->lp_ctx, NULL, "torture", name,
 			     default_value);
 }
 
 double torture_setting_double(struct torture_context *test, const char *name, 
 							double default_value)
 {
-	return lp_parm_double(test->lp_ctx, NULL, "torture", name, default_value);
+	return lpcfg_parm_double(test->lp_ctx, NULL, "torture", name, default_value);
 }
 
 bool torture_setting_bool(struct torture_context *test, const char *name, 
 							bool default_value)
 {
-	return lp_parm_bool(test->lp_ctx, NULL, "torture", name, default_value);
+	return lpcfg_parm_bool(test->lp_ctx, NULL, "torture", name, default_value);
 }
 
 const char *torture_setting_string(struct torture_context *test, 
@@ -482,7 +482,7 @@ const char *torture_setting_string(struct torture_context *test,
 	SMB_ASSERT(test != NULL);
 	SMB_ASSERT(test->lp_ctx != NULL);
 	
-	ret = lp_parm_string(test->lp_ctx, NULL, "torture", name);
+	ret = lpcfg_parm_string(test->lp_ctx, NULL, "torture", name);
 
 	if (ret == NULL)
 		return default_value;
diff --git a/lib/util/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c
index 178192e..2b6679e 100644
--- a/lib/util/charset/tests/iconv.c
+++ b/lib/util/charset/tests/iconv.c
@@ -35,7 +35,7 @@ static bool iconv_untestable(struct torture_context *tctx)
 {
 	iconv_t cd;
 
-	if (!lp_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true))
+	if (!lpcfg_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true))
 		torture_skip(tctx, "system iconv disabled - skipping test");
 
 	cd = iconv_open("UTF-16LE", "UCS-4LE");
@@ -158,8 +158,8 @@ static bool test_buffer(struct torture_context *test,
 						     "failed to open %s to UTF-16LE",
 						     charset));
 		}
-		cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lp_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
-		cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lp_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
+		cd2 = smb_iconv_open_ex(test, charset, "UTF-16LE", lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
+		cd3 = smb_iconv_open_ex(test, "UTF-16LE", charset, lpcfg_parm_bool(test->lp_ctx, NULL, "iconv", "native", true));
 		last_charset = charset;
 	}
 
@@ -289,7 +289,7 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint)
 	size_t size, size2;
 	codepoint_t c;
 
-	size = push_codepoint_convenience(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint);
+	size = push_codepoint_convenience(lpcfg_iconv_convenience(tctx->lp_ctx), (char *)buf, codepoint);
 	torture_assert(tctx, size != -1 || (codepoint >= 0xd800 && codepoint <= 0x10000), 
 		       "Invalid Codepoint range");
 
@@ -300,7 +300,7 @@ static bool test_codepoint(struct torture_context *tctx, unsigned int codepoint)
 	buf[size+2] = random();
 	buf[size+3] = random();
 
-	c = next_codepoint_convenience(lp_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2);
+	c = next_codepoint_convenience(lpcfg_iconv_convenience(tctx->lp_ctx), (char *)buf, &size2);
 
 	torture_assert(tctx, c == codepoint, 
 		       talloc_asprintf(tctx, 
diff --git a/lib/util/tests/strlist.c b/lib/util/tests/strlist.c
index bf56243..ce7d1e4 100644
--- a/lib/util/tests/strlist.c
+++ b/lib/util/tests/strlist.c
@@ -376,8 +376,8 @@ static bool test_list_unique_2(struct torture_context *tctx)
 	const char **list = (const char **)str_list_make_empty(tctx);
 	const char **list_dup = (const char **)str_list_make_empty(tctx);
 
-	count = lp_parm_int(tctx->lp_ctx, NULL, "list_unique", "count", 9);
-	num_dups = lp_parm_int(tctx->lp_ctx, NULL, "list_unique", "dups", 7);
+	count = lpcfg_parm_int(tctx->lp_ctx, NULL, "list_unique", "count", 9);
+	num_dups = lpcfg_parm_int(tctx->lp_ctx, NULL, "list_unique", "dups", 7);
 	torture_comment(tctx, "test_list_unique_2() with %d elements and %d dups\n", count, num_dups);
 
 	for (i = 0; i < count; i++) {
diff --git a/libcli/nbt/tools/nmblookup.c b/libcli/nbt/tools/nmblookup.c
index b756c1e..7950ab8 100644
--- a/libcli/nbt/tools/nmblookup.c
+++ b/libcli/nbt/tools/nmblookup.c
@@ -357,14 +357,14 @@ int main(int argc, const char *argv[])
 		exit(1);
 	}
 
-	load_interfaces(NULL, lp_interfaces(cmdline_lp_ctx), &ifaces);
+	load_interfaces(NULL, lpcfg_interfaces(cmdline_lp_ctx), &ifaces);
 
 	ev = s4_event_context_init(talloc_autofree_context());
 
 	while (poptPeekArg(pc)) {
 		const char *name = poptGetArg(pc);
 
-		ret &= process_one(cmdline_lp_ctx, ev, ifaces, name, lp_nbt_port(cmdline_lp_ctx));
+		ret &= process_one(cmdline_lp_ctx, ev, ifaces, name, lpcfg_nbt_port(cmdline_lp_ctx));
 	}
 
 	talloc_free(ev);
diff --git a/nsswitch/libwbclient/tests/wbclient.c b/nsswitch/libwbclient/tests/wbclient.c
index e2b3794..948081b 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -611,7 +611,7 @@ static bool test_wbc_change_password(struct torture_context *tctx)
 	E_md4hash(oldpass, old_nt_hash);
 	E_md4hash(newpass, new_nt_hash);
 
-	if (lp_client_lanman_auth(tctx->lp_ctx) &&
+	if (lpcfg_client_lanman_auth(tctx->lp_ctx) &&
 	    E_deshash(newpass, new_lanman_hash) &&
 	    E_deshash(oldpass, old_lanman_hash)) {
 
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 8aff753..acdcfde 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -669,9 +669,9 @@ _PUBLIC_ void cli_credentials_set_conf(struct cli_credentials *cred,
 			      struct loadparm_context *lp_ctx)
 {
 	cli_credentials_set_username(cred, "", CRED_UNINITIALISED);
-	cli_credentials_set_domain(cred, lp_workgroup(lp_ctx), CRED_UNINITIALISED);
-	cli_credentials_set_workstation(cred, lp_netbios_name(lp_ctx), CRED_UNINITIALISED);
-	cli_credentials_set_realm(cred, lp_realm(lp_ctx), CRED_UNINITIALISED);
+	cli_credentials_set_domain(cred, lpcfg_workgroup(lp_ctx), CRED_UNINITIALISED);
+	cli_credentials_set_workstation(cred, lpcfg_netbios_name(lp_ctx), CRED_UNINITIALISED);
+	cli_credentials_set_realm(cred, lpcfg_realm(lp_ctx), CRED_UNINITIALISED);
 }
 
 /**
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index 2e88cf4..e0fd052 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -361,7 +361,7 @@ _PUBLIC_ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cr
 	cred->machine_account_pending = false;
 	filter = talloc_asprintf(cred, SECRETS_PRIMARY_DOMAIN_FILTER, 
 				       cli_credentials_get_domain(cred));
-	status = cli_credentials_set_secrets(cred, event_context_find(cred), lp_ctx, NULL, 
+	status = cli_credentials_set_secrets(cred, event_context_find(cred), lp_ctx, NULL,
 					   SECRETS_PRIMARY_DOMAIN_DN,
 					     filter, &error_string);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -391,7 +391,7 @@ NTSTATUS cli_credentials_set_krbtgt(struct cli_credentials *cred,
 	filter = talloc_asprintf(cred, SECRETS_KRBTGT_SEARCH,
 				       cli_credentials_get_realm(cred),
 				       cli_credentials_get_domain(cred));
-	status = cli_credentials_set_secrets(cred, event_ctx, lp_ctx, NULL, 
+	status = cli_credentials_set_secrets(cred, event_ctx, lp_ctx, NULL,
 					     SECRETS_PRINCIPALS_DN,
 					     filter, &error_string);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -423,7 +423,7 @@ _PUBLIC_ NTSTATUS cli_credentials_set_stored_principal(struct cli_credentials *c
 				 cli_credentials_get_realm(cred),
 				 cli_credentials_get_domain(cred),
 				 serviceprincipal);
-	status = cli_credentials_set_secrets(cred, event_ctx, lp_ctx, NULL, 
+	status = cli_credentials_set_secrets(cred, event_ctx, lp_ctx, NULL,
 					     SECRETS_PRINCIPALS_DN, filter,
 					     &error_string);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c
index f4ee264..622f674 100644
--- a/source4/auth/credentials/credentials_krb5.c
+++ b/source4/auth/credentials/credentials_krb5.c
@@ -41,7 +41,7 @@ _PUBLIC_ int cli_credentials_get_krb5_context(struct cli_credentials *cred,
 		return 0;
 	}
 
-	ret = smb_krb5_init_context(cred, event_ctx, lp_ctx, 
+	ret = smb_krb5_init_context(cred, event_ctx, lp_ctx,
 				    &cred->smb_krb5_context);
 	if (ret) {
 		cred->smb_krb5_context = NULL;
@@ -144,7 +144,7 @@ _PUBLIC_ int cli_credentials_set_ccache(struct cli_credentials *cred,
 		return ENOMEM;
 	}
 
-	ret = cli_credentials_get_krb5_context(cred, event_ctx, lp_ctx, 
+	ret = cli_credentials_get_krb5_context(cred, event_ctx, lp_ctx,
 					       &ccc->smb_krb5_context);
 	if (ret) {
 		(*error_string) = error_message(ret);
@@ -216,7 +216,7 @@ static int cli_credentials_new_ccache(struct cli_credentials *cred,
 		return ENOMEM;
 	}
 
-	ret = cli_credentials_get_krb5_context(cred, event_ctx, lp_ctx, 
+	ret = cli_credentials_get_krb5_context(cred, event_ctx, lp_ctx,
 					       &ccc->smb_krb5_context);
 	if (ret) {
 		talloc_free(ccc);
@@ -417,7 +417,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
 		return 0;
 	}
 
-	ret = cli_credentials_get_ccache(cred, event_ctx, lp_ctx, 
+	ret = cli_credentials_get_ccache(cred, event_ctx, lp_ctx,
 					 &ccache, error_string);
 	if (ret) {
 		DEBUG(1, ("Failed to get CCACHE for GSSAPI client: %s\n", error_message(ret)));
@@ -607,7 +607,7 @@ _PUBLIC_ int cli_credentials_get_keytab(struct cli_credentials *cred,
 		return EINVAL;
 	}
 
-	ret = cli_credentials_get_krb5_context(cred, event_ctx, lp_ctx, 
+	ret = cli_credentials_get_krb5_context(cred, event_ctx, lp_ctx,
 					       &smb_krb5_context);
 	if (ret) {
 		return ret;
@@ -683,7 +683,7 @@ _PUBLIC_ int cli_credentials_set_keytab_name(struct cli_credentials *cred,
 
 _PUBLIC_ int cli_credentials_update_keytab(struct cli_credentials *cred, 
 					   struct tevent_context *event_ctx,
-				  struct loadparm_context *lp_ctx) 
+				  struct loadparm_context *lp_ctx)
 {
 	krb5_error_code ret;
 	struct keytab_container *ktc;
diff --git a/source4/auth/credentials/pycredentials.c b/source4/auth/credentials/pycredentials.c
index 361e4c9..86ce63e 100644
--- a/source4/auth/credentials/pycredentials.c
+++ b/source4/auth/credentials/pycredentials.c
@@ -204,8 +204,8 @@ static PyObject *py_creds_guess(py_talloc_Object *self, PyObject *args)
 	if (!PyArg_ParseTuple(args, "|O", &py_lp_ctx))
 		return NULL;
 
-	lp_ctx = lp_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
-	if (lp_ctx == NULL) 
+	lp_ctx = lpcfg_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
+	if (lp_ctx == NULL)
 		return NULL;
 
 	cli_credentials_guess(creds, lp_ctx);
@@ -225,8 +225,8 @@ static PyObject *py_creds_set_machine_account(py_talloc_Object *self, PyObject *
 	if (!PyArg_ParseTuple(args, "|O", &py_lp_ctx))
 		return NULL;
 
-	lp_ctx = lp_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
-	if (lp_ctx == NULL) 
+	lp_ctx = lpcfg_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
+	if (lp_ctx == NULL)
 		return NULL;
 
 	status = cli_credentials_set_machine_account(creds, lp_ctx);
@@ -270,8 +270,8 @@ static PyObject *py_creds_get_named_ccache(py_talloc_Object *self, PyObject *arg
 	if (!PyArg_ParseTuple(args, "|Os", &py_lp_ctx, &ccache_name))
 		return NULL;
 
-	lp_ctx = lp_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
-	if (lp_ctx == NULL) 
+	lp_ctx = lpcfg_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
+	if (lp_ctx == NULL)
 		return NULL;
 
 	event_ctx = tevent_context_init(NULL);
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index b166d23..3520585 100644
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -47,7 +47,7 @@ _PUBLIC_ struct gensec_security_ops **gensec_security_all(void)
 
 bool gensec_security_ops_enabled(struct gensec_security_ops *ops, struct gensec_security *security)
 {
-	return lp_parm_bool(security->settings->lp_ctx, NULL, "gensec", ops->name, ops->enabled);
+	return lpcfg_parm_bool(security->settings->lp_ctx, NULL, "gensec", ops->name, ops->enabled);
 }
 
 /* Sometimes we want to force only kerberos, sometimes we want to
@@ -1397,12 +1397,12 @@ static int sort_gensec(struct gensec_security_ops **gs1, struct gensec_security_
 
 int gensec_setting_int(struct gensec_settings *settings, const char *mechanism, const char *name, int default_value)
 {
-	return lp_parm_int(settings->lp_ctx, NULL, mechanism, name, default_value);
+	return lpcfg_parm_int(settings->lp_ctx, NULL, mechanism, name, default_value);
 }
 
 bool gensec_setting_bool(struct gensec_settings *settings, const char *mechanism, const char *name, bool default_value)
 {
-	return lp_parm_bool(settings->lp_ctx, NULL, mechanism, name, default_value);
+	return lpcfg_parm_bool(settings->lp_ctx, NULL, mechanism, name, default_value);
 }
 
 /*
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index 88fbcce..f28ab95 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -247,7 +247,7 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
 		return NT_STATUS_INTERNAL_ERROR;
 	}
 
-	realm = lp_realm(gensec_security->settings->lp_ctx);
+	realm = lpcfg_realm(gensec_security->settings->lp_ctx);
 	if (realm != NULL) {
 		ret = gsskrb5_set_default_realm(realm);
 		if (ret) {
@@ -352,12 +352,12 @@ static NTSTATUS gensec_gssapi_client_start(struct gensec_security *gensec_securi
 	gensec_gssapi_state = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
 
 	principal = gensec_get_target_principal(gensec_security);
-	if (principal && lp_client_use_spnego_principal(gensec_security->settings->lp_ctx)) {
+	if (principal && lpcfg_client_use_spnego_principal(gensec_security->settings->lp_ctx)) {
 		name_type = GSS_C_NULL_OID;
 	} else {
 		principal = talloc_asprintf(gensec_gssapi_state, "%s/%s@%s",
 					    gensec_get_target_service(gensec_security), 
-					    hostname, lp_realm(gensec_security->settings->lp_ctx));
+					    hostname, lpcfg_realm(gensec_security->settings->lp_ctx));
 
 		name_type = GSS_C_NT_USER_NAME;
 	}		
@@ -1364,7 +1364,7 @@ static NTSTATUS gensec_gssapi_session_info(struct gensec_security *gensec_securi
 		
 		ret = cli_credentials_set_client_gss_creds(session_info->credentials, 
 							   gensec_security->event_ctx,
-							   gensec_security->settings->lp_ctx, 
+							   gensec_security->settings->lp_ctx,
 							   gensec_gssapi_state->delegated_cred_handle,
 							   CRED_SPECIFIED, &error_string);
 		if (ret) {
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index 3ae80dd..fc76fad 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -69,7 +69,7 @@ static struct gensec_settings *settings_from_object(TALLOC_CTX *mem_ctx, PyObjec
 	}
 	
 	s->target_hostname = PyString_AsString(py_hostname);
-	s->lp_ctx = lp_from_py_object(s, py_lp_ctx);
+	s->lp_ctx = lpcfg_from_py_object(s, py_lp_ctx);
 	return s;
 }
 
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index d4b2948..6f508b4 100644
--- a/source4/auth/gensec/schannel.c
+++ b/source4/auth/gensec/schannel.c
@@ -126,15 +126,15 @@ static NTSTATUS schannel_update(struct gensec_security *gensec_security, TALLOC_
 		workstation = bind_schannel.oem_netbios_computer.a;
 		domain = bind_schannel.oem_netbios_domain.a;
 
-		if (strcasecmp_m(domain, lp_workgroup(gensec_security->settings->lp_ctx)) != 0) {
+		if (strcasecmp_m(domain, lpcfg_workgroup(gensec_security->settings->lp_ctx)) != 0) {
 			DEBUG(3, ("Request for schannel to incorrect domain: %s != our domain %s\n",
-				  domain, lp_workgroup(gensec_security->settings->lp_ctx)));
+				  domain, lpcfg_workgroup(gensec_security->settings->lp_ctx)));
 
 			return NT_STATUS_LOGON_FAILURE;
 		}
 
 		status = schannel_get_creds_state(out_mem_ctx,
-						  lp_private_dir(gensec_security->settings->lp_ctx),
+						  lpcfg_private_dir(gensec_security->settings->lp_ctx),
 						  workstation, &creds);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(3, ("Could not find session key for attempted schannel connection from %s: %s\n",
diff --git a/source4/auth/gensec/spnego.c b/source4/auth/gensec/spnego.c
index bbcba8d..612216a 100644
--- a/source4/auth/gensec/spnego.c
+++ b/source4/auth/gensec/spnego.c
@@ -827,7 +827,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
 
 		if (spnego.negTokenInit.targetPrincipal) {
 			DEBUG(5, ("Server claims it's principal name is %s\n", spnego.negTokenInit.targetPrincipal));
-			if (lp_client_use_spnego_principal(gensec_security->settings->lp_ctx)) {
+			if (lpcfg_client_use_spnego_principal(gensec_security->settings->lp_ctx)) {
 				gensec_set_target_principal(gensec_security, spnego.negTokenInit.targetPrincipal);
 			}
 		}
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 3bd938f..ff356aa 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -398,7 +398,7 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
 		return ret;
 	}
 
-	realm = lp_realm(lp_ctx);
+	realm = lpcfg_realm(lp_ctx);
 	if (realm != NULL) {
 		ret = krb5_set_default_realm(krb5_ctx, realm);
 		if (ret) {
@@ -480,7 +480,7 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx,
 	/* Set options in kerberos */
 
 	krb5_set_dns_canonicalize_hostname((*smb_krb5_context)->krb5_context,
-					   lp_parm_bool(lp_ctx, NULL, "krb5", "set_dns_canonicalize", false));
+					   lpcfg_parm_bool(lp_ctx, NULL, "krb5", "set_dns_canonicalize", false));
 
 	return 0;
 }
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index a9c3262..17fbfca 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -255,7 +255,7 @@ _PUBLIC_ struct tevent_req *auth_check_password_send(TALLOC_CTX *mem_ctx,
 	state->method		= NULL;
 
 	if (!user_info->mapped_state) {
-		nt_status = map_user_info(req, lp_workgroup(auth_ctx->lp_ctx),
+		nt_status = map_user_info(req, lpcfg_workgroup(auth_ctx->lp_ctx),
 					  user_info, &user_info_tmp);
 		if (tevent_req_nterror(req, nt_status)) {
 			return tevent_req_post(req, ev);
@@ -478,15 +478,15 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **
 static const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
 	const char **auth_methods = NULL;
-	switch (lp_server_role(lp_ctx)) {
+	switch (lpcfg_server_role(lp_ctx)) {
 	case ROLE_STANDALONE:
-		auth_methods = lp_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "standalone", NULL);
+		auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "standalone", NULL);
 		break;
 	case ROLE_DOMAIN_MEMBER:
-		auth_methods = lp_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "member server", NULL);
+		auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "member server", NULL);
 		break;
 	case ROLE_DOMAIN_CONTROLLER:
-		auth_methods = lp_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "domain controller", NULL);
+		auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "domain controller", NULL);
 		break;
 	}
 	return auth_methods;
diff --git a/source4/auth/ntlm/auth_anonymous.c b/source4/auth/ntlm/auth_anonymous.c
index c889071..d5f1df2 100644
--- a/source4/auth/ntlm/auth_anonymous.c
+++ b/source4/auth/ntlm/auth_anonymous.c
@@ -54,7 +54,7 @@ static NTSTATUS anonymous_check_password(struct auth_method_context *ctx,
 					 const struct auth_usersupplied_info *user_info, 
 					 struct auth_serversupplied_info **_server_info)
 {
-	return auth_anonymous_server_info(mem_ctx, lp_netbios_name(ctx->auth_ctx->lp_ctx), _server_info);
+	return auth_anonymous_server_info(mem_ctx, lpcfg_netbios_name(ctx->auth_ctx->lp_ctx), _server_info);
 }
 
 static const struct auth_operations anonymous_auth_ops = {
diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c
index 6d1ed0e..fdcc5bd 100644
--- a/source4/auth/ntlm/auth_sam.c
+++ b/source4/auth/ntlm/auth_sam.c
@@ -99,7 +99,7 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
 		*lm_sess_key = data_blob(NULL, 0);
 		*user_sess_key = data_blob(NULL, 0);
 		status = hash_password_check(mem_ctx, 
-					     lp_lanman_auth(auth_context->lp_ctx),
+					     lpcfg_lanman_auth(auth_context->lp_ctx),
 					     user_info->password.hash.lanman,
 					     user_info->password.hash.nt,
 					     user_info->mapped.account_name,
@@ -109,8 +109,8 @@ static NTSTATUS authsam_password_ok(struct auth_context *auth_context,
 		
 	case AUTH_PASSWORD_RESPONSE:
 		status = ntlm_password_check(mem_ctx, 
-					     lp_lanman_auth(auth_context->lp_ctx),
-						 lp_ntlm_auth(auth_context->lp_ctx),
+					     lpcfg_lanman_auth(auth_context->lp_ctx),
+						 lpcfg_ntlm_auth(auth_context->lp_ctx),
 					     user_info->logon_parameters, 
 					     &auth_context->challenge.data, 
 					     &user_info->password.response.lanman, 
@@ -229,8 +229,8 @@ static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx
 		return nt_status;
 	}
 
-	nt_status = authsam_make_server_info(tmp_ctx, ctx->auth_ctx->sam_ctx, lp_netbios_name(ctx->auth_ctx->lp_ctx),
- 					     lp_sam_name(ctx->auth_ctx->lp_ctx),
+	nt_status = authsam_make_server_info(tmp_ctx, ctx->auth_ctx->sam_ctx, lpcfg_netbios_name(ctx->auth_ctx->lp_ctx),
+					     lpcfg_sam_name(ctx->auth_ctx->lp_ctx),
 					     domain_dn,
 					     msg,
 					     user_sess_key, lm_sess_key,
@@ -270,13 +270,13 @@ static NTSTATUS authsam_want_check(struct auth_method_context *ctx,
 		return NT_STATUS_NOT_IMPLEMENTED;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list