source: branches/samba-3.0/packaging/Debian/debian-sarge/patches/fhs.patch@ 286

source/Makefile.in

@@ -90 +90 @@
 # the directory where lock files go
 LOCKDIR = @lockdir@
 
+
+
+
+
+
+
+
 # the directory where pid files go
 PIDDIR = @piddir@
 # man pages language(s)
@@ -114 +121 @@
 PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
 PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
               -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
-PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
+PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
 PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
 
 # Note that all executable programs now provide for an optional executable suffix.
@@ -1319 +1326 @@
         @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
 
 installdat: installdirs
-        @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
+        @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(DIR) $(srcdir)
 
 installmsg: installdirs
         @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)

source/configure.in

@@ -35 +35 @@
 [  --with-fhs              Use FHS-compliant paths (default=no)],
 [ case "$withval" in
   yes)
-    lockdir="\${VARDIR}/lib/samba"
+    lockdir="\${VARDIR}//samba"
     piddir="\${VARDIR}/run"
     mandir="\${prefix}/share/man"
     logfilebase="\${VARDIR}/log/samba"
@@ -43 +43 @@
     libdir="\${prefix}/lib/samba"
     configdir="${sysconfdir}/samba"
     swatdir="\${DATADIR}/samba/swat"
+
+
+
+
     ;;
   esac])
 
@@ -201 +205 @@
 AC_SUBST(sbindir)
 AC_SUBST(rootsbindir)
 AC_SUBST(pammodulesdir)
+
+
+
 
 dnl Unique-to-Samba variables we'll be playing with.
 AC_SUBST(SHELL)

source/dynconfig.c

@@ -53 +53 @@
 pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
 
 /**
+
+
+
+
+
+
+
  * @brief Samba library directory.
  *
  * @sa lib_path() to get the path to a file inside the LIBDIR.
@@ -70 +77 @@
 
 pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
 pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

source/include/dynconfig.h

@@ -31 +31 @@
 extern pstring dyn_CONFIGFILE;
 extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
 extern pstring dyn_LIBDIR;
+
 extern fstring dyn_SHLIBEXT;
 extern pstring dyn_LOCKDIR;
 extern pstring dyn_PIDDIR;
 extern pstring dyn_SMB_PASSWD_FILE;
 extern pstring dyn_PRIVATE_DIR;
+
+
+

source/intl/lang_tdb.c

@@ -128 +128 @@
         if (!lang) 
                 return True;
 
-        asprintf(&msg_path, "%s.msg", lib_path((const char *)lang));
+        asprintf(&msg_path, "%s.msg", _path((const char *)lang));
         if (stat(msg_path, &st) != 0) {
                 /* the msg file isn't available */
                 DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 

source/lib/util.c

@@ -2362 +2362 @@
 }
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * @brief Returns the platform specific shared library extension.
  *
  * @retval Pointer to a static #fstring containing the extension.

source/libsmb/samlogon_cache.c

@@ -34 +34 @@
 BOOL netsamlogon_cache_init(void)
 {
         if (!netsamlogon_tdb) {
-                netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
+                netsamlogon_tdb = tdb_open_log(_path(NETSAMLOGON_TDB), 0,
                                                    TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
         }
 

source/nmbd/nmbd_serverlistdb.c

@@ -327 +327 @@
 
         updatecount++;
     
-        pstrcpy(fname,lp_lockdir());
+        pstrcpy(fname,());
         trim_char(fname,'\0' ,'/');
         pstrcat(fname,"/");
         pstrcat(fname,SERVER_LIST);

source/nmbd/nmbd_winsserver.c

@@ -234 +234 @@
 
         add_samba_names_to_subnet(wins_server_subnet);
 
-        if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+        if((fp = x_fopen(_path(WINS_LIST),O_RDONLY,0)) == NULL) {
                 DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
                         WINS_LIST, strerror(errno) ));
                 return True;
@@ -1810 +1810 @@
                 }
         }
 
-        slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
+        slprintf(fname,sizeof(fname)-1,"%s/%s", (), WINS_LIST);
         all_string_sub(fname,"//", "/", 0);
         slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
 

source/nsswitch/winbindd_cache.c

@@ -57 +57 @@
                 return True;
 
         /* when working offline we must not clear the cache on restart */
-        wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+        wcache->tdb = tdb_open_log(_path("winbindd_cache.tdb"),
                                 WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
                                 TDB_DEFAULT /*TDB_CLEAR_IF_FIRST*/, O_RDWR|O_CREAT, 0600);
 
@@ -2223 +2223 @@
                 tdb_close(wcache->tdb);
                 wcache->tdb = NULL;
 
-                if (unlink(lock_path("winbindd_cache.tdb")) == -1) {
+                if (unlink(_path("winbindd_cache.tdb")) == -1) {
                         DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
-                                lock_path("winbindd_cache.tdb"),
+                                _path("winbindd_cache.tdb"),
                                 strerror(errno) ));
                         return False;
                 }
@@ -2487 +2487 @@
                 return;
 
         /* when working offline we must not clear the cache on restart */
-        wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+        wcache->tdb = tdb_open_log(_path("winbindd_cache.tdb"),
                                 WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
                                 lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
                                 O_RDWR|O_CREAT, 0600);

source/param/loadparm.c

@@ -104 +104 @@
         char *szAddPrinterCommand;
         char *szDeletePrinterCommand;
         char *szOs2DriverMap;
+
+
+
         char *szLockDir;
         char *szPidDir;
         char *szRootdir;
@@ -1105 +1108 @@
         {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
         {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
         {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
+
+
+
+
         {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
         {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
+
         {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
 #ifdef WITH_UTMP
         {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 

source/passdb/pdb_tdb.c

@@ -1598 +1598 @@
         /* save the path for later */
                            
         if ( !location ) {
-                pstr_sprintf( tdbfile, "%s/%s", lp_private_dir(), PASSDB_FILE_NAME );
+                pstr_sprintf( tdbfile, "%s );
                 pfile = tdbfile;
         }
         pstrcpy( tdbsam_filename, pfile );

source/passdb/secrets.c

@@ -55 +55 @@
         if (tdb)
                 return True;
 
-        pstrcpy(fname, lp_private_dir());
-        pstrcat(fname,"/secrets.tdb");
+        pstrcpy(fname, state_path("secrets.tdb"));
 
         tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 

source/printing/nt_printing.c

@@ -298 +298 @@
  
         if (tdb_drivers)
                 tdb_close(tdb_drivers);
-        tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        tdb_drivers = tdb_open_log(_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
         if (!tdb_drivers) {
                 DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
-                        lock_path("ntdrivers.tdb"), strerror(errno) ));
+                        _path("ntdrivers.tdb"), strerror(errno) ));
                 return False;
         }
  
         if (tdb_printers)
                 tdb_close(tdb_printers);
-        tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        tdb_printers = tdb_open_log(_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
         if (!tdb_printers) {
                 DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
-                        lock_path("ntprinters.tdb"), strerror(errno) ));
+                        _path("ntprinters.tdb"), strerror(errno) ));
                 return False;
         }
  
         if (tdb_forms)
                 tdb_close(tdb_forms);
-        tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        tdb_forms = tdb_open_log(_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
         if (!tdb_forms) {
                 DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
-                        lock_path("ntforms.tdb"), strerror(errno) ));
+                        _path("ntforms.tdb"), strerror(errno) ));
                 return False;
         }
  

source/printing/printing.c

@@ -177 +177 @@
         int services = lp_numservices();
         int snum;
 
-        unlink(lock_path("printing.tdb"));
-        pstrcpy(printing_path,lock_path("printing"));
+        unlink(_path("printing.tdb"));
+        pstrcpy(printing_path,_path("printing"));
         mkdir(printing_path,0755);
 
         /* handle a Samba upgrade */

source/printing/printing_db.c

@@ -89 +89 @@
                 DLIST_ADD(print_db_head, p);
         }
 
-        pstrcpy(printdb_path, lock_path("printing/"));
+        pstrcpy(printdb_path, _path("printing/"));
         pstrcat(printdb_path, printername);
         pstrcat(printdb_path, ".tdb");
 

source/registry/reg_db.c

@@ -205 +205 @@
         if ( tdb_reg )
                 return True;
 
-        if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+        if ( !(tdb_reg = tdb_open_log(_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
         {
-                tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+                tdb_reg = tdb_open_log(_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
                 if ( !tdb_reg ) {
                         DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
-                                lock_path("registry.tdb"), strerror(errno) ));
+                                _path("registry.tdb"), strerror(errno) ));
                         return False;
                 }
                 
@@ -252 +252 @@
         
         become_root();
 
-        tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+        tdb_reg = tdb_open_log(_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
         if ( !tdb_reg ) {
                 result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
                 DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
-                        lock_path("registry.tdb"), strerror(errno) ));
+                        _path("registry.tdb"), strerror(errno) ));
         }
 
         unbecome_root();

source/lib/sharesec.c

@@ -47 +47 @@
                 return True;
         }
 
-        share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        share_tdb = tdb_open_log(_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
         if (!share_tdb) {
                 DEBUG(0,("Failed to open share info database %s (%s)\n",
-                        lock_path("share_info.tdb"), strerror(errno) ));
+                        _path("share_info.tdb"), strerror(errno) ));
                 return False;
         }
  

source/smbd/lanman.c

@@ -1052 +1052 @@
         BOOL local_list_only;
         int i;
 
-        lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0);
+        lines = file_lines_load(_path(SERVER_LIST), NULL, 0);
         if (!lines) {
-                DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
+                DEBUG(4,("Can't open %s - %s\n",_path(SERVER_LIST),strerror(errno)));
                 return 0;
         }
 

source/printing/nt_printing.c

@@ -2065 +2065 @@
         close_all_print_db();
 
         if (geteuid() == 0) {
-                pstrcpy(printdb_path, lock_path("printing/"));
+                pstrcpy(printdb_path, _path("printing/"));
                 pstrcat(printdb_path, sharename);
                 pstrcat(printdb_path, ".tdb");
 

source/groupdb/mapping_tdb.c

@@ -39 +39 @@
         if (tdb)
                 return True;
                 
-        tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        tdb = tdb_open_log(_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
         if (!tdb) {
                 DEBUG(0,("Failed to open group mapping database\n"));
                 return False;

source/lib/account_pol.c

@@ -213 +213 @@
                 return True;
         }
 
-        tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+        tdb = tdb_open_log(_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
         if (!tdb) { /* the account policies files does not exist or open failed, try to create a new one */
-                tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+                tdb = tdb_open_log(_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
                 if (!tdb) {
                         DEBUG(0,("Failed to open account policy database\n"));
                         return False;

source/lib/util_unistr.c

@@ -88 +88 @@
         }
         initialised = 1;
 
-        upcase_table = (smb_ucs2_t *)map_file(lib_path("upcase.dat"),
+        upcase_table = (smb_ucs2_t *)map_file(_path("upcase.dat"),
                                               0x20000);
         upcase_table_use_unmap = ( upcase_table != NULL );
 
-        lowcase_table = (smb_ucs2_t *)map_file(lib_path("lowcase.dat"),
+        lowcase_table = (smb_ucs2_t *)map_file(_path("lowcase.dat"),
                                                0x20000);
         lowcase_table_use_unmap = ( lowcase_table != NULL );
 
@@ -230 +230 @@
                 return;
         }
 
-        valid_file = (uint8 *)map_file(lib_path("valid.dat"), 0x10000);
+        valid_file = (uint8 *)map_file(_path("valid.dat"), 0x10000);
         if (valid_file) {
                 valid_table = valid_file;
                 mapped_file = 1;

source/libsmb/samlogon_cache.c

@@ -67 +67 @@
            winbindd_cache.tdb open.  Open the tdb if a NULL is passed. */
 
         if (!tdb) {
-                tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 
+                tdb = tdb_open_log(_path("winbindd_cache.tdb"), 
                                    WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
                                    TDB_DEFAULT, O_RDWR, 0600);
                 if (!tdb) {

source/nsswitch/idmap_tdb.c

@@ -247 +247 @@
         }
 
         /* use the old database if present */
-        tdbfile = talloc_strdup(ctx, lock_path("winbindd_idmap.tdb"));
+        tdbfile = talloc_strdup(ctx, _path("winbindd_idmap.tdb"));
         if (!tdbfile) {
                 DEBUG(0, ("Out of memory!\n"));
                 ret = NT_STATUS_NO_MEMORY;

source/passdb/pdb_tdb.c

@@ -1559 +1559 @@
         uint32 rid;
         BOOL ret = False;
 
-        tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
+        tdb = tdb_open_log(_path("winbindd_idmap.tdb"), 0,
                            TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
 
         if (tdb == NULL) {