The branch, v3-3-test has been updated via 53cb5c7336d898c75915b9ab368069b087ca61f5 (commit) via df01ba06121430ec7f151fa9ffc518425d9d7be6 (commit) via fd83cc1b47e776263ea3f3cb12a17195f4f6847e (commit) via 58628cb4bcf3417c8d242b556bb353ba0ebe6295 (commit) via a0b90e42fe24e42b785111428836078b194728de (commit) via f5c484caa57c6aff276118d7c901dda33d32cf3b (commit) via d6e32fdef7a321081de6cffa6e25efe0245c40ee (commit) via 8e19123bf0732974ce2df25cca4216b1bd17ca24 (commit) via c46f0450e570074bf2530785cacb799e91f81435 (commit) via 6048ac2981d584e7801d80b8cd7bb11bf6032db9 (commit) via bbb3f6e9b5abdbe321ad0658c442d5bc6c3a4477 (commit) via 38f4a77feafdd9c40e1cb670c5e0cd971f130706 (commit) via fd2595b4cf18de08a3124be0080a2c28bdb130ba (commit) via b809c5190c9704af8ec4d0157afa6df03ad5a42a (commit) via 40000ceb2abb859dc21a8aa2d55bfe5c594dcfad (commit) via 5550e3903d41927a078084e22539b697c19773b0 (commit) via ae45ea1debc38c0c01da3f8cc1dddcc0d1ff30e2 (commit) via c22842440dc1732a77e0bce71fff421b1bca0151 (commit) via e4f2815158bd74245e6c4d7f10d59254e095846c (commit) via d498bdf6e8d77db221bea79b3c0d4a2dd415be46 (commit) via 43a26e856aa39cd70d1428b554532ea6c3f2018c (commit) via cf89392a74e84fdd9bfbeb6e9c0bbf2ce298f115 (commit) via 6a5447b15a1b534659e62e929688b6a9d742e2be (commit) via 02dc99ef564ca7c2da322d2942cf28aeb7bcae2f (commit) via 253c3ae70674daa4ad619c2dd66ad8b0c02af908 (commit) from b0c63c062fe90e4a4ec61ff5b5849e758834b8d7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log ----------------------------------------------------------------- commit 53cb5c7336d898c75915b9ab368069b087ca61f5 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 22:31:53 2008 +0200 gitignore: add examples/libsmbclient/tree Michael (cherry picked from commit e5c4cbbf5a4b3e5db1732043a74cd1f4a5eec136) commit df01ba06121430ec7f151fa9ffc518425d9d7be6 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 22:31:07 2008 +0200 gitignore: add lib/netapi/tests/Makefile Michael (cherry picked from commit fdf29c1cdf6b9bd1c6fb7a9f070084e0df5470bb) commit fd83cc1b47e776263ea3f3cb12a17195f4f6847e Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 22:34:26 2008 +0200 gitignore: add libsmbsharemodes.syms - this is now generated Michael (cherry picked from commit 11458f9a9ac17c68aa0496d2ade4b93d02e7ebcc) commit 58628cb4bcf3417c8d242b556bb353ba0ebe6295 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 15:09:27 2008 +0200 build: auto-generate symbols for libsmbsharemodes. Michael (cherry picked from commit f1d84e76bb6935e80b01d13414980f8de1f71824) commit a0b90e42fe24e42b785111428836078b194728de Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 22:33:17 2008 +0200 gitignore: add libsmbclient.syms - this is now generated Michael (cherry picked from commit 02d4b820fccfef1387f47db4bb5ade3dfd0d25bb) commit f5c484caa57c6aff276118d7c901dda33d32cf3b Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 15:06:02 2008 +0200 build: autogenerate symbols for libsmbclient.so Michael (cherry picked from commit d6fb6348a3672e915556dcb36c1a4999d4abae18) commit d6e32fdef7a321081de6cffa6e25efe0245c40ee Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 14:56:18 2008 +0200 build: fix bug #5590 by not linking in the static libs but the objects. Michael (cherry picked from commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a) commit 8e19123bf0732974ce2df25cca4216b1bd17ca24 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 14:55:24 2008 +0200 build: fall down to the same place when using an internal lib statically. Michael (cherry picked from commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1) commit c46f0450e570074bf2530785cacb799e91f81435 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 14:47:26 2008 +0200 build: remove duplicated and hardcoded definition of LIBSMBSHAREMODES Michael (cherry picked from commit c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb) commit 6048ac2981d584e7801d80b8cd7bb11bf6032db9 Author: Michael Adam <[EMAIL PROTECTED]> Date: Wed Aug 20 13:22:13 2008 +0200 build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency. Michael (cherry picked from commit ead9b9d7167d999d73cf4111f3b321236aac2a15) commit bbb3f6e9b5abdbe321ad0658c442d5bc6c3a4477 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 15:55:17 2008 +0200 configure: use libdir=${prefix}/lib and modules=${libdir}/samba as default with-fhs. This is what one actually wants: Shared/static libs in /usr/lib, shared modules and so on in /usr/lib/samba. Michael (cherry picked from commit 03de8c1955a85f2e3e9f947309e09023138a1591) commit 38f4a77feafdd9c40e1cb670c5e0cd971f130706 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 14:38:41 2008 +0200 configure: use ${libdir} instead of \${LIBDIR}. Now after removing --with-libdir, the value of ${libdir} won't change anymore at that stage, so there is no need to have the variable expansion deferred to "make". Michael (cherry picked from commit 256977cf05cb4c4073ece1389a7e4939b18f5f13) commit fd2595b4cf18de08a3124be0080a2c28bdb130ba Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 14:35:46 2008 +0200 configure: remove the --with-libdir parameter. This is redundant: use the autoconf-provided --libdir instead. This will also make the new distinction between libdir and modulesdir more visible. Michael (cherry picked from commit c1d53b7c767275b39dc8ecfcd5b6129ee2cabb6d) commit b809c5190c9704af8ec4d0157afa6df03ad5a42a Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:45:57 2008 +0200 popt: add support for setting MODULESDIR via popt_common_dynconfig. Michael (cherry picked from commit 81030e49ce344260d279a3112b13a21ce3520748) commit 40000ceb2abb859dc21a8aa2d55bfe5c594dcfad Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:50:56 2008 +0200 svcctl: use MODULESDIR instead of LIBDIR for the svcctl script directory. Michael (cherry picked from commit bb19634138cfd1f527c44e16a44aa21ebee50c1c) commit 5550e3903d41927a078084e22539b697c19773b0 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:49:19 2008 +0200 libgpo: use MODULESDIR instead of LIBDIR for the group policy extensions. Michael (cherry picked from commit 3346dd40832e8d61edfe4c56dce6fe85031f20f1) commit ae45ea1debc38c0c01da3f8cc1dddcc0d1ff30e2 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:47:30 2008 +0200 Use module_path() instead of lib_path() for loading shared modules. Michael (cherry picked from commit 22fb3ef1bb4abb33b49d275f9a5d85a1924c22ea) commit c22842440dc1732a77e0bce71fff421b1bca0151 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:44:14 2008 +0200 Add modules_path() to construct paths to files in MODULESDIR. Michael (cherry picked from commit 5ef9da6f4f04b07804b389902862fae0fbbfed13) commit e4f2815158bd74245e6c4d7f10d59254e095846c Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:46:46 2008 +0200 buildoptions: output MODULESDIR. Michael (cherry picked from commit bcb868e4340a856c4009450479628088a8a1628c) commit d498bdf6e8d77db221bea79b3c0d4a2dd415be46 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:43:31 2008 +0200 dynconfig: add support for MODULESDIR. Michael (cherry picked from commit 34309f097f5c7321930bf6c2ea2447de1008130c) commit 43a26e856aa39cd70d1428b554532ea6c3f2018c Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:36:49 2008 +0200 configure: Add --with-modulesdir to accompany --with-libdir. This starts the seplitting of libdir in to libdir and modulesdir. Our shared libs should go into libdir, the internal shared modules, codepages, and other stuff that was originally in libdir, should go into modulesdir. The idea behind this is, that in a typical installation, the shared (and static) libraries (as libtalloc, libsmbclient, libwbclient and others) should be put into /usr/lib, while the e.g. the vfs modules should reside in /usr/lib/samba. This is meant to ease the work of packagers and reduce the needs for manual interaction and workarounds. Michael (cherry picked from commit b17d1ff646e22c3e979224d119b283fc3af780a8) commit cf89392a74e84fdd9bfbeb6e9c0bbf2ce298f115 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:58:47 2008 +0200 dynconfig: remove commented-out old stuff from dynconfig.c and dynconfig.h Michael (cherry picked from commit 85a781fa0248fcd0cefcc4de25b3dea3e37d5844) commit 6a5447b15a1b534659e62e929688b6a9d742e2be Author: Michael Adam <[EMAIL PROTECTED]> Date: Thu Aug 14 23:44:06 2008 +0200 dynconfig: remove unused prototypes. set_dyn_STATEDIR, is_default_dyn_STATEDIR, set_dyn_CACHEDIR, is_default_dyn_CACHEDIR are neither used nor implemented. Michael (cherry picked from commit f30b70b2c3a49bc962848039953a565a040b563d) commit 02dc99ef564ca7c2da322d2942cf28aeb7bcae2f Author: Michael Adam <[EMAIL PROTECTED]> Date: Thu Aug 14 23:14:42 2008 +0200 proto.h: remove prototypes from dynconfig.c These are also in dynconfig.h and were originally added by "make proto" by accident. Michael (cherry picked from commit 4fb69fe1eeebc466944f3daacfacec60ad043b0c) commit 253c3ae70674daa4ad619c2dd66ad8b0c02af908 Author: Michael Adam <[EMAIL PROTECTED]> Date: Thu Aug 14 23:18:28 2008 +0200 Makefile: print codepagedir in "make showlayout". Michael (cherry picked from commit a823733b91958adf938214113e6875315c6ae5b2) ----------------------------------------------------------------------- Summary of changes: .gitignore | 4 + source/Makefile.in | 44 ++++--- source/dynconfig.c | 217 +--------------------------------- source/exports/libsmbclient.syms | 4 - source/exports/libsmbsharemodes.syms | 3 - source/include/dynconfig.h | 29 ++--- source/include/proto.h | 26 +---- source/lib/module.c | 2 +- source/lib/popt_common.c | 10 ++ source/lib/util.c | 13 ++ source/libgpo/gpext/gpext.c | 2 +- source/m4/aclocal.m4 | 4 +- source/m4/check_path.m4 | 23 ++-- source/script/mkbuildoptions.awk | 1 + source/services/services_db.c | 6 +- source/services/svc_rcinit.c | 6 +- 16 files changed, 88 insertions(+), 306 deletions(-) delete mode 100644 source/exports/libsmbclient.syms delete mode 100644 source/exports/libsmbsharemodes.syms Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index 5e779f1..ca09083 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ source/include/stamp-h source/include/version.h source/Makefile source/lib/netapi/examples/Makefile +source/lib/netapi/tests/Makefile source/config.log source/config.status source/configure @@ -32,6 +33,8 @@ source/cscope.out source/torture.tdb source/pkgconfig/*.pc source/st +source/exports/libsmbclient.syms +source/exports/libsmbsharemodes.syms source/exports/libnetapi.syms source/exports/libtalloc.syms source/exports/libtdb.syms @@ -61,6 +64,7 @@ examples/libsmbclient/teststat3 examples/libsmbclient/testutime examples/libsmbclient/testwrite examples/libsmbclient/testtruncate +examples/libsmbclient/tree source/librpc/gen_ndr/cli_krb5pac.* source/librpc/gen_ndr/cli_messaging.* source/librpc/gen_ndr/cli_misc.* diff --git a/source/Makefile.in b/source/Makefile.in index d0eba62..100618d 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -99,17 +99,18 @@ BINDIR = @bindir@ SBINDIR = @sbindir@ ROOTSBINDIR = @rootsbindir@ LIBDIR = @libdir@ +MODULESDIR = @modulesdir@ [EMAIL PROTECTED]@ PAMMODULESDIR = @pammodulesdir@ -VFSLIBDIR = $(LIBDIR)/vfs -PDBLIBDIR = $(LIBDIR)/pdb -RPCLIBDIR = $(LIBDIR)/rpc -IDMAPLIBDIR = $(LIBDIR)/idmap -NSSINFOLIBDIR = $(LIBDIR)/nss_info -CHARSETLIBDIR = $(LIBDIR)/charset -AUTHLIBDIR = $(LIBDIR)/auth -CONFIGLIBDIR = $(LIBDIR)/config -GPEXTLIBDIR = $(LIBDIR)/gpext +VFSLIBDIR = $(MODULESDIR)/vfs +PDBLIBDIR = $(MODULESDIR)/pdb +RPCLIBDIR = $(MODULESDIR)/rpc +IDMAPLIBDIR = $(MODULESDIR)/idmap +NSSINFOLIBDIR = $(MODULESDIR)/nss_info +CHARSETLIBDIR = $(MODULESDIR)/charset +AUTHLIBDIR = $(MODULESDIR)/auth +CONFIGLIBDIR = $(MODULESDIR)/config +GPEXTLIBDIR = $(MODULESDIR)/gpext CONFIGDIR = @configdir@ VARDIR = @localstatedir@ MANDIR = @mandir@ @@ -166,6 +167,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ -DLOCKDIR=\"$(LOCKDIR)\" \ -DPIDDIR=\"$(PIDDIR)\" \ -DLIBDIR=\"$(LIBDIR)\" \ + -DMODULESDIR=\"$(MODULESDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" \ -DSHLIBEXT=\"@[EMAIL PROTECTED]" \ -DCTDBDIR=\"$(CTDBDIR)\" \ @@ -1822,7 +1824,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@ # #------------------------------------------------------------------- -LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ +LIBNETAPI_OBJ0 = lib/netapi/netapi.o \ lib/netapi/cm.o \ librpc/gen_ndr/ndr_libnetapi.o \ lib/netapi/libnetapi.o \ @@ -1835,7 +1837,7 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ lib/netapi/samr.o \ lib/netapi/sid.o -LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ +LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \ $(LIBSMBCONF_OBJ) \ $(REG_SMBCONF_OBJ) \ $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -1867,9 +1869,9 @@ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) @rm -f $@ @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ -$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) +$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ0) libnetapi: $(LIBNETAPI) @@ -1915,10 +1917,13 @@ [EMAIL PROTECTED]@ LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER) [EMAIL PROTECTED]@ LIBSMBCLIENT=$(LIBSMBCLIENT_STATIC_TARGET) @LIBSMBCLIENT_SHARED@ -#LIBSMBCLIENT_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@ +LIBSMBCLIENT_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@ LIBSMBCLIENT_HEADERS=$(srcdir)/include/libsmbclient.h -$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +$(LIBSMBCLIENT_SYMS): $(LIBSMBCLIENT_HEADERS) + @$(MKSYMS_SH) $(AWK) $@ $(LIBSMBCLIENT_HEADERS) + +$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \ @@ -1984,12 +1989,13 @@ [EMAIL PROTECTED]@ LIBSMBSHAREMODES_SHARED_TARGET_SONAME=$(LIBSMBSHAREMODES_SHARED_TARGET).$(LIBSMBSHAREMODES_SOVER) [EMAIL PROTECTED]@ LIBSMBSHAREMODES=$(LIBSMBSHAREMODES_STATIC_TARGET) @LIBSMBSHAREMODES_SHARED@ -#LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@ +LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@ LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h -LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ +$(LIBSMBSHAREMODES_SYMS): $(LIBSMBSHAREMODES_HEADERS) + @$(MKSYMS_SH) $(AWK) $@ $(LIBSMBSHAREMODES_HEADERS) -$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ +$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) $(LIBSMBSHAREMODES_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \ $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \ @@ -2541,6 +2547,7 @@ showlayout:: @echo " bindir: $(BINDIR)" @echo " sbindir: $(SBINDIR)" @echo " libdir: $(LIBDIR)" + @echo " modulesdir: $(MODULESDIR)" @echo " vardir: $(VARDIR)" @echo " mandir: $(MANDIR)" @echo " privatedir: $(PRIVATE_DIR)" @@ -2548,6 +2555,7 @@ showlayout:: @echo " lockdir: $(LOCKDIR)" @echo " piddir: $(PIDDIR)" @echo " swatdir: $(SWATDIR)" + @echo " codepagedir: $(CODEPAGEDIR)" uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSUPCALL@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@ diff --git a/source/dynconfig.c b/source/dynconfig.c index 57008ec..3a54507 100644 --- a/source/dynconfig.c +++ b/source/dynconfig.c @@ -40,12 +40,6 @@ * table? There's kind of a chicken-and-egg situation there... **/ -#if 0 -static char const *dyn_SBINDIR = SBINDIR; -static char const *dyn_BINDIR = BINDIR; -static char const *dyn_SWATDIR = SWATDIR; -#endif - #define DEFINE_DYN_CONFIG_PARAM(name) \ static char *dyn_##name; \ \ @@ -79,222 +73,13 @@ DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/ DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/ DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR) DEFINE_DYN_CONFIG_PARAM(LIBDIR) +DEFINE_DYN_CONFIG_PARAM(MODULESDIR) DEFINE_DYN_CONFIG_PARAM(SHLIBEXT) DEFINE_DYN_CONFIG_PARAM(LOCKDIR) DEFINE_DYN_CONFIG_PARAM(PIDDIR) DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE) DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR) -#if 0 -static char *dyn_CONFIGFILE; /**< Location of smb.conf file. **/ - -const char *get_dyn_CONFIGFILE(void) -{ - if (dyn_CONFIGFILE == NULL) { - return CONFIGFILE; - } - return dyn_CONFIGFILE; -} - -const char *set_dyn_CONFIGFILE(const char *newpath) -{ - if (dyn_CONFIGFILE) { - SAFE_FREE(dyn_CONFIGFILE); - } - dyn_CONFIGFILE = SMB_STRDUP(newpath); - return dyn_CONFIGFILE; -} - -/** Log file directory. **/ -static char *dyn_LOGFILEBASE; - -const char *get_dyn_LOGFILEBASE(void) -{ - if (dyn_LOGFILEBASE == NULL) { - return LOGFILEBASE; - } - return dyn_LOGFILEBASE; -} - -const char *set_dyn_LOGFILEBASE(const char *newpath) -{ - if (dyn_LOGFILEBASE) { - SAFE_FREE(dyn_LOGFILEBASE); - } - dyn_LOGFILEBASE = SMB_STRDUP(newpath); - return dyn_LOGFILEBASE; -} - -/** Statically configured LanMan hosts. **/ -static char *dyn_LMHOSTSFILE; - -const char *get_dyn_LMHOSTSFILE(void) -{ - if (dyn_LMHOSTSFILE == NULL) { - return LMHOSTSFILE; - } - return dyn_LMHOSTSFILE; -} - -const char *set_dyn_LMHOSTSFILE(const char *newpath) -{ - if (dyn_LMHOSTSFILE) { - SAFE_FREE(dyn_LMHOSTSFILE); - } - dyn_LMHOSTSFILE = SMB_STRDUP(newpath); - return dyn_LMHOSTSFILE; -} - -/** - * @brief Samba data directory. - * - * @sa data_path() to get the path to a file inside the CODEPAGEDIR. - **/ -static char *dyn_CODEPAGEDIR; - -const char *get_dyn_CODEPAGEDIR(void) -{ - if (dyn_CODEPAGEDIR == NULL) { - return CODEPAGEDIR; - } - return dyn_CODEPAGEDIR; -} - -const char *set_dyn_CODEPAGEDIR(const char *newpath) -{ - if (dyn_CODEPAGEDIR) { - SAFE_FREE(dyn_CODEPAGEDIR); - } - dyn_CODEPAGEDIR = SMB_STRDUP(newpath); - return dyn_CODEPAGEDIR; -} - -/** - * @brief Samba library directory. - * - * @sa lib_path() to get the path to a file inside the LIBDIR. - **/ -static char *dyn_LIBDIR; - -const char *get_dyn_LIBDIR(void) -{ - if (dyn_LIBDIR == NULL) { - return LIBDIR; - } - return dyn_CODEPAGEDIR; -} - -const char *set_dyn_LIBDIR(const char *newpath) -{ - if (dyn_LIBDIR) { - SAFE_FREE(dyn_LIBDIR); - } - dyn_LIBDIR = SMB_STRDUP(newpath); - return dyn_LIBDIR; -} - -static char *dyn_SHLIBEXT; - -const char *get_dyn_SHLIBEXT(void) -{ - if (dyn_SHLIBEXT == NULL) { - return SHLIBEXT; - } - return dyn_SHLIBEXT; -} - -const char *set_dyn_SHLIBEXT(const char *newpath) -{ - if (dyn_SHLIBEXT) { - SAFE_FREE(dyn_SHLIBEXT); - } - dyn_SHLIBEXT = SMB_STRDUP(newpath); - return dyn_SHLIBEXT; -} - -/** - * @brief Directory holding lock files. - * - * Not writable, but used to set a default in the parameter table. - **/ - -static char *dyn_LOCKDIR; - -const char *get_dyn_LOCKDIR(void) -{ - if (dyn_LOCKDIR == NULL) { - return LOCKDIR; - } - return dyn_LOCKDIR; -} - -const char *set_dyn_LOCKDIR(const char *newpath) -{ - if (dyn_LOCKDIR) { - SAFE_FREE(dyn_LOCKDIR); - } - dyn_LOCKDIR = SMB_STRDUP(newpath); - return dyn_LOCKDIR; -} - -static char *dyn_PIDDIR; - -const char *get_dyn_PIDDIR(void) -{ - if (dyn_PIDDIR == NULL) { - return PIDDIR; - } - return dyn_PIDDIR; -} - -const char *set_dyn_PIDDIR(const char *newpath) -{ - if (dyn_PIDDIR) { - SAFE_FREE(dyn_PIDDIR); - } - dyn_PIDDIR = SMB_STRDUP(newpath); - return dyn_PIDDIR; -} - -static char *dyn_SMB_PASSWD_FILE; - -const char *get_dyn_SMB_PASSWD_FILE(void) -{ - if (dyn_SMB_PASSWD_FILE == NULL) { - return SMB_PASSWD_FILE; - } - return dyn_SMB_PASSWD_FILE; -} - -const char *set_dyn_SMB_PASSWD_FILE(const char *newpath) -{ - if (dyn_SMB_PASSWD_FILE) { - SAFE_FREE(dyn_SMB_PASSWD_FILE); - } - dyn_SMB_PASSWD_FILE = SMB_STRDUP(newpath); - return dyn_SMB_PASSWD_FILE; -} - -static char *dyn_PRIVATE_DIR; - -const char *get_dyn_PRIVATE_DIR(void) -{ - if (dyn_PRIVATE_DIR == NULL) { - return PRIVATE_DIR; - } - return dyn_PRIVATE_DIR; -} - -const char *set_dyn_PRIVATE_DIR(const char *newpath) -{ - if (dyn_PRIVATE_DIR) { - SAFE_FREE(dyn_PRIVATE_DIR); - } - dyn_PRIVATE_DIR = SMB_STRDUP(newpath); - return dyn_PRIVATE_DIR; -} -#endif - /* In non-FHS mode, these should be configurable using 'lock dir ='; but in FHS mode, they are their own directory. Implement as wrapper functions so that everything can still be kept in dynconfig.c. diff --git a/source/exports/libsmbclient.syms b/source/exports/libsmbclient.syms deleted file mode 100644 index 3062e34..0000000 --- a/source/exports/libsmbclient.syms +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: smbc_*; - local: *; -}; diff --git a/source/exports/libsmbsharemodes.syms b/source/exports/libsmbsharemodes.syms deleted file mode 100644 index eb34bfc..0000000 --- a/source/exports/libsmbsharemodes.syms +++ /dev/null @@ -1,3 +0,0 @@ -{ - global: *; -}; diff --git a/source/include/dynconfig.h b/source/include/dynconfig.h index 57909bc..758bde3 100644 --- a/source/include/dynconfig.h +++ b/source/include/dynconfig.h @@ -23,22 +23,6 @@ * @brief Exported global configurations. **/ -#if 0 -const char *get_dyn_SBINDIR(void); -const char *get_dyn_BINDIR(void); -const char *get_dyn_SWATDIR(void); - -extern char dyn_CONFIGFILE[1024]; -extern char dyn_LOGFILEBASE[1024], dyn_LMHOSTSFILE[1024]; -extern char dyn_LIBDIR[1024]; -extern char dyn_CODEPAGEDIR[1024]; -extern fstring dyn_SHLIBEXT; -extern char dyn_LOCKDIR[1024]; -extern char dyn_PIDDIR[1024]; -extern char dyn_SMB_PASSWD_FILE[1024]; -extern char dyn_PRIVATE_DIR[1024]; -#endif - const char *get_dyn_SBINDIR(void); const char *set_dyn_SBINDIR(const char *newpath); bool is_default_dyn_SBINDIR(void); @@ -71,6 +55,10 @@ const char *get_dyn_LIBDIR(void); const char *set_dyn_LIBDIR(const char *newpath); bool is_default_dyn_LIBDIR(void); +const char *get_dyn_MODULESDIR(void); +const char *set_dyn_MODULESDIR(const char *newpath); +bool is_default_dyn_MODULESDIR(void); + const char *get_dyn_SHLIBEXT(void); const char *set_dyn_SHLIBEXT(const char *newpath); bool is_default_dyn_SHLIBEXT(void); @@ -91,10 +79,11 @@ const char *get_dyn_PRIVATE_DIR(void); const char *set_dyn_PRIVATE_DIR(const char *newpath); bool is_default_dyn_PRIVATE_DIR(void); +/* + * For STATEDIR and CACHEDIR, there are only getter functions. + * In non-FHS-mode, these are configurable via LOCKDIR. + * In FHS-mode, these are their own fixed directories. + */ const char *get_dyn_STATEDIR(void); -const char *set_dyn_STATEDIR(const char *newpath); -bool is_default_dyn_STATEDIR(void); const char *get_dyn_CACHEDIR(void); -const char *set_dyn_CACHEDIR(const char *newpath); -bool is_default_dyn_CACHEDIR(bool); diff --git a/source/include/proto.h b/source/include/proto.h index 65bfe39..0e089b0 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -182,31 +182,6 @@ void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token); void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid, int n_groups, gid_t *groups); -/* The following definitions come from dynconfig.c */ - -const char *get_dyn_CONFIGFILE(void); -const char *set_dyn_CONFIGFILE(const char *newpath); -const char *get_dyn_LOGFILEBASE(void); -const char *set_dyn_LOGFILEBASE(const char *newpath); -const char *get_dyn_LMHOSTSFILE(void); -const char *set_dyn_LMHOSTSFILE(const char *newpath); -const char *get_dyn_CODEPAGEDIR(void); -const char *set_dyn_CODEPAGEDIR(const char *newpath); -const char *get_dyn_LIBDIR(void); -const char *set_dyn_LIBDIR(const char *newpath); -const char *get_dyn_SHLIBEXT(void); -const char *set_dyn_SHLIBEXT(const char *newpath); -const char *get_dyn_LOCKDIR(void); -const char *set_dyn_LOCKDIR(const char *newpath); -const char *get_dyn_PIDDIR(void); -const char *set_dyn_PIDDIR(const char *newpath); -const char *get_dyn_SMB_PASSWD_FILE(void); -const char *set_dyn_SMB_PASSWD_FILE(const char *newpath); -const char *get_dyn_PRIVATE_DIR(void); -const char *set_dyn_PRIVATE_DIR(const char *newpath); -const char *get_dyn_STATEDIR(void); -const char *get_dyn_CACHEDIR(void); - /* The following definitions come from groupdb/mapping.c */ NTSTATUS add_initial_entry(gid_t gid, const char *sid, enum lsa_SidType sid_name_use, const char *nt_name, const char *comment); @@ -1365,6 +1340,7 @@ char *myhostname(void); char *lock_path(const char *name); -- Samba Shared Repository