+++ /dev/null
---- source/param/loadparm.c Wed Oct 9 21:17:05 2002
-+++ source/param/loadparm.c Mon Oct 14 16:33:08 2002
-@@ -386,6 +386,8 @@
- BOOL bInheritPerms;
- BOOL bInheritACLS;
- BOOL bMSDfsRoot;
-+ BOOL bMSDfsProxy;
-+ char *bMSDfsLinkName;
- BOOL bUseClientDriver;
- BOOL bDefaultDevmode;
- BOOL bNTAclSupport;
-@@ -508,6 +510,8 @@
- False, /* bInheritPerms */
- False, /* bInheritACLS */
- False, /* bMSDfsRoot */
-+ False, /* bMSDfsProxy */
-+ NULL, /* bMSDfsLinkName */
- False, /* bUseClientDriver */
- False, /* bDefaultDevmode */
- True, /* bNTAclSupport */
-@@ -1079,6 +1083,8 @@
-
-
- {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE},
-+ {"msdfs proxy", P_BOOL, P_LOCAL, &sDefault.bMSDfsProxy, NULL, NULL, FLAG_SHARE},
-+ {"msdfs link name", P_STRING, P_LOCAL, &sDefault.bMSDfsLinkName, NULL, NULL, FLAG_SHARE},
- {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
- {"Winbind options", P_SEP, P_SEPARATOR},
-@@ -1730,6 +1736,8 @@
- FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles)
- FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation)
- FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
-+FN_LOCAL_BOOL(lp_msdfs_proxy, bMSDfsProxy)
-+FN_LOCAL_STRING(lp_msdfs_link_name, bMSDfsLinkName)
- FN_LOCAL_BOOL(lp_autoloaded, autoloaded)
- FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose)
- FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose)
---- source/msdfs/msdfs.c Tue Jul 2 08:34:24 2002
-+++ source/msdfs/msdfs.c Mon Oct 14 16:49:57 2002
-@@ -600,12 +600,38 @@
- int reply_size = 0;
- char *pathnamep = pathname;
-
-+ struct connection_struct conns;
-+ struct connection_struct* conn = &conns;
-+ int snum;
-+ pstring conn_path;
-+ struct dfs_path dpi;
-+
-+ struct junction_map junction2;
-+ parse_dfs_path(pathname, &dpi);
-+ pstrcpy(junction2.service_name, dpi.servicename);
-+ snum = lp_servicenumber(junction2.service_name);
-+ create_conn_struct(conn, snum, conn_path);
-+
-+
- ZERO_STRUCT(junction);
-
- /* get the junction entry */
- if (!pathnamep)
- return -1;
-
-+ if (lp_msdfs_proxy(SNUM(conn))) {
-+ DEBUG(10,("running in proxy mode\n"));
-+ pstrcpy(pathnamep, "\\");
-+ pstrcat(pathnamep, dpi.hostname);
-+ pstrcat(pathnamep, "\\");
-+ pstrcat(pathnamep, dpi.servicename);
-+ pstrcat(pathnamep, "\\");
-+ pstrcat(pathnamep, (char *) lp_msdfs_link_name(SNUM(conn)));
-+ } else {
-+ DEBUG(10,("running in normal mode\n"));
-+ }
-+
-+
- /* Trim pathname sent by client so it begins with only one backslash.
- Two backslashes confuse some dfs clients
- */
-@@ -631,6 +657,17 @@
- }
- }
-
-+ if ( lp_msdfs_proxy(SNUM(conn)) ) {
-+ DEBUG(10,("running in proxy mode\n"));
-+ pstrcpy ( pathnamep, "\\" );
-+ pstrcat ( pathnamep, dpi.hostname);
-+ pstrcat ( pathnamep, "\\" );
-+ pstrcat ( pathnamep, dpi.servicename);
-+ } else {
-+ DEBUG(10,("running in normal mode\n"));
-+ }
-+
-+
- /* create the referral depeding on version */
- DEBUG(10,("max_referral_level :%d\n",max_referral_level));
- if(max_referral_level<2 || max_referral_level>3)
+++ /dev/null
-diff -Nur source/utils/net.c source/utils/net.c
---- source/utils/net.c Fri Sep 27 09:42:34 2002
-+++ source/utils/net.c Tue Oct 1 12:22:00 2002
-@@ -68,6 +68,7 @@
- int opt_port = 0;
- int opt_maxusers = -1;
- char *opt_comment = "";
-+char *opt_container = "cn=Users";
- int opt_flags = -1;
- int opt_jobid = 0;
- int opt_timeout = 0;
-@@ -459,6 +460,7 @@
- {"myname", 'n', POPT_ARG_STRING, &opt_requester_name},
- {"conf", 's', POPT_ARG_STRING, &servicesf},
- {"server", 'S', POPT_ARG_STRING, &opt_host},
-+ {"container", 'c', POPT_ARG_STRING, &opt_container},
- {"comment", 'C', POPT_ARG_STRING, &opt_comment},
- {"maxusers", 'M', POPT_ARG_INT, &opt_maxusers},
- {"flags", 'F', POPT_ARG_INT, &opt_flags},
-diff -Nur source/utils/net.h source/utils/net.h
---- source/utils/net.h Tue Jun 25 04:29:09 2002
-+++ source/utils/net.h Tue Oct 1 12:19:51 2002
-@@ -38,10 +38,8 @@
-
- extern int opt_maxusers;
- extern char *opt_comment;
-+extern char *opt_container;
- extern int opt_flags;
--
--extern char *opt_comment;
--
- extern char *opt_target_workgroup;
- extern int opt_long_list_entries;
- extern int opt_reboot;
-diff -Nur source/utils/net_ads.c source/utils/net_ads.c
---- source/utils/net_ads.c Tue Sep 17 14:15:52 2002
-+++ source/utils/net_ads.c Tue Oct 1 12:33:44 2002
-@@ -255,7 +255,7 @@
- goto done;
- }
-
-- status = ads_add_user_acct(ads, argv[0], opt_comment);
-+ status = ads_add_user_acct(ads, argv[0], opt_container, opt_comment);
-
- if (!ADS_ERR_OK(status)) {
- d_printf("Could not add user %s: %s\n", argv[0],
-@@ -431,7 +431,7 @@
- goto done;
- }
-
-- status = ads_add_group_acct(ads, argv[0], opt_comment);
-+ status = ads_add_group_acct(ads, argv[0], opt_container, opt_comment);
-
- if (ADS_ERR_OK(status)) {
- d_printf("Group %s added\n", argv[0]);
-diff -Nur source/utils/net_help.c source/utils/net_help.c
---- source/utils/net_help.c Tue Sep 24 20:10:30 2002
-+++ source/utils/net_help.c Tue Oct 1 13:01:50 2002
-@@ -69,14 +69,14 @@
- "\n\tDelete specified user\n");
- d_printf("\nnet [<method>] user INFO <name> [misc. options] [targets]"\
- "\n\tList the domain groups of the specified user\n");
-- d_printf("\nnet [<method>] user ADD <name> [password] "\
-+ d_printf("\nnet [<method>] user ADD <name> [password] [-c container] "\
- "[-F user flags] [misc. options]"\
- " [targets]\n\tAdd specified user\n");
-
- net_common_methods_usage(argc, argv);
- net_common_flags_usage(argc, argv);
-- d_printf(
-- "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+ d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+ d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
- return -1;
- }
-
-@@ -85,12 +85,12 @@
- "\n\tList user groups\n\n");
- d_printf("net [<method>] group DELETE <name> [misc. options] [targets]"\
- "\n\tDelete specified group\n");
-- d_printf("\nnet [<method>] group ADD <name> [-C comment]"\
-+ d_printf("\nnet [<method>] group ADD <name> [-C comment] [-c container]"\
- " [misc. options] [targets]\n\tCreate specified group\n");
- net_common_methods_usage(argc, argv);
- net_common_flags_usage(argc, argv);
-- d_printf(
-- "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+ d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+ d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
- return -1;
- }
-
-diff -Nur source/libads/ldap_user.c source/libads/ldap_user.c
---- source/libads/ldap_user.c Wed Aug 7 12:33:22 2002
-+++ source/libads/ldap_user.c Tue Oct 1 12:46:08 2002
-@@ -38,7 +38,7 @@
- }
-
- ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user,
-- const char *fullname)
-+ const char *container, const char *fullname)
- {
- TALLOC_CTX *ctx;
- ADS_MODLIST mods;
-@@ -57,7 +60,7 @@
-
- if (!(upn = talloc_asprintf(ctx, "%s@%s", user, ads->config.realm)))
- goto done;
-- if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", name,
-+ if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container,
- ads->config.bind_path)))
- goto done;
- if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT)))
-@@ -80,7 +83,7 @@
- }
-
- ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group,
-- const char *comment)
-+ const char *container, const char *comment)
- {
- TALLOC_CTX *ctx;
- ADS_MODLIST mods;
-@@ -93,7 +96,7 @@
-
- status = ADS_ERROR(LDAP_NO_MEMORY);
-
-- if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", group,
-+ if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", group, container,
- ads->config.bind_path)))
- goto done;
- if (!(mods = ads_init_mods(ctx)))
-@@ -102,7 +105,7 @@
- ads_mod_str(ctx, &mods, "cn", group);
- ads_mod_strlist(ctx, &mods, "objectClass",objectClass);
- ads_mod_str(ctx, &mods, "name", group);
-- if (comment)
-+ if (comment && *comment)
- ads_mod_str(ctx, &mods, "description", comment);
- ads_mod_str(ctx, &mods, "sAMAccountName", group);
- status = ads_gen_add(ads, new_dn, mods);
+++ /dev/null
---- examples/pdb/Makefile Thu Sep 5 02:11:41 2002
-+++ examples/pdb/Makefile Thu Sep 5 02:11:59 2002
-@@ -8,7 +8,7 @@
- SAMBA_INCL = ../../source/include
- UBIQX_SRC = ../../source/ubiqx
- SMBWR_SRC = ../../source/smbwrapper
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
-+CFLAGS = -I/usr/include/heimdal -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
- PDB_OBJS = pdb_test.so
-
- # Default target
+++ /dev/null
---- source/python/py_common.c 2002-12-22 03:07:40.000000000 +0100
-+++ source/python/py_common.c 2002-11-29 11:50:22.000000000 +0100
-@@ -45,9 +45,6 @@
-
- void py_samba_init(void)
- {
-- extern pstring global_myname;
-- char *p;
--
- if (initialised)
- return;
-
-@@ -59,11 +56,7 @@
- /* Misc other stuff */
-
- load_interfaces();
--
-- fstrcpy(global_myname, myhostname());
-- p = strchr(global_myname, '.');
-- if (p)
-- *p = 0;
-+ init_names();
-
- initialised = True;
- }
---- source/python/py_smb.c 2002-11-27 03:54:20.000000000 +0100
-+++ source/python/py_smb.c 2002-11-29 11:50:22.000000000 +0100
-@@ -61,7 +61,6 @@
- static char *kwlist[] = { "called", "calling", NULL };
- char *calling_name = NULL, *called_name;
- struct nmb_name calling, called;
-- extern pstring global_myname;
- BOOL result;
-
- if (!PyArg_ParseTupleAndKeywords(args, kw, "s|s", kwlist, &called_name,
-@@ -69,7 +68,7 @@
- return NULL;
-
- if (!calling_name)
-- calling_name = global_myname;
-+ calling_name = global_myname();
-
- make_nmb_name(&calling, calling_name, 0x00);
- make_nmb_name(&called, called_name, 0x20);
+++ /dev/null
---- examples/VFS/samba-vscan-0.3.1/fprot/Makefile 2002-11-26 15:20:17.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/fprot/Makefile 2002-12-19 13:26:19.000000000 +0100
-@@ -14,7 +14,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- VFS_OBJS = vscan-fprotd.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fprotd.lo vscan-fprotd_core.lo
---- examples/VFS/samba-vscan-0.3.1/include/vscan-global.h 2002-11-25 16:48:10.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/include/vscan-global.h 2002-12-19 13:26:34.000000000 +0100
-@@ -93,7 +93,7 @@
- */
-
- #ifndef SAMBA_VERSION_MAJOR
--# define SAMBA_VERSION_MAJOR 2
-+# define SAMBA_VERSION_MAJOR 3
- #endif
-
- #ifndef SAMBA_VERSION_MINOR
---- examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile 2002-11-28 17:40:35.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile 2002-12-19 13:27:23.000000000 +0100
-@@ -23,9 +23,9 @@
- VFS_OBJS = vscan-kavp.so
-
- ifdef USE_DEBUG
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- else
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- endif
-
- ifndef USE_KAVPSHAREDLIB
---- examples/VFS/samba-vscan-0.3.1/mks/Makefile 2002-11-26 16:29:55.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/mks/Makefile 2002-12-19 13:27:53.000000000 +0100
-@@ -13,7 +13,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- VFS_OBJS = vscan-mksd.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-mksd.c vscan-mksd_core.c vscan-mksd.h vscan-mksd_core.h mks.h mks_c.c
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-mksd.lo vscan-mksd_core.lo mks_c.lo
---- examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile 2002-11-27 19:24:03.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile 2002-12-19 13:28:10.000000000 +0100
-@@ -15,7 +15,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- VFS_OBJS = vscan-oav.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-oav.lo vscan-oav_core.lo
---- examples/VFS/samba-vscan-0.3.1/sophos/Makefile 2002-11-27 19:24:03.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/sophos/Makefile 2002-12-19 13:29:20.000000000 +0100
-@@ -15,7 +15,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- VFS_OBJS = vscan-sophos.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-sophos.lo vscan-sophos_core.lo
---- examples/VFS/samba-vscan-0.3.1/trend/Makefile 2002-11-27 19:24:03.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/trend/Makefile 2002-12-19 13:29:31.000000000 +0100
-@@ -15,7 +15,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- VFS_OBJS = vscan-trend.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-trend.lo vscan-trend_core.lo
git.samba.org / tprouty / samba.git / commitdiff