Removed all references to network/spoolout/ directory

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index edcdd66d3bbd6d865d371e7d40e51253b0ff5a0d..bfd7da72abf9a4fc0edf5070611722d07ec11ef1 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -206,8 +206,7 @@ upgrade: install-exec install-doc
        @echo
 
 install-data:
-       @for i in messages network/spoolin \
-                network/spoolout; do \
+       @for i in messages network/spoolin ; do
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
        @for i in public_clients citadel_urlshorteners.rc \
@@ -221,7 +220,7 @@ install-data:
        fi
 
 install-data-new:
-       @for i in network/spoolin network/spoolout network/systems; do \
+       @for i in network/spoolin network/systems; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(RUN_DIR)/$$i; \
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
@@ -236,7 +235,6 @@ install-data-new:
                $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
        -@if test -d $(DESTDIR)/etc/pam.d; then \
                echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
                $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \

diff --git a/citadel/debian/citadel-server.dirs b/citadel/debian/citadel-server.dirs
index a4a80449511a810974c83cf3c51242032f0f28a9..26eaed6dc036bec1dd462c1f973850d57cd9084c 100644 (file)
--- a/citadel/debian/citadel-server.dirs
+++ b/citadel/debian/citadel-server.dirs
@@ -7,4 +7,3 @@ var/lib/citadel/info
 var/lib/citadel/userpics
 var/run/citadel
 var/spool/citadel/network/spoolin
-var/spool/citadel/network/spoolout

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index 9cde767d088ae190fa20347286768164fbb7e617..8f532dace17867ac3412145c25f6d164e8bb0476 100644 (file)
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -21,7 +21,6 @@ extern char ctdl_etc_dir[PATH_MAX];
 extern char ctdl_autoetc_dir[PATH_MAX];
 extern char ctdl_run_dir[PATH_MAX];
 extern char ctdl_spool_dir[PATH_MAX];
-extern char ctdl_netout_dir[PATH_MAX];
 extern char ctdl_netdigest_dir[PATH_MAX];
 extern char ctdl_nettmp_dir[PATH_MAX];
 extern char ctdl_netcfg_dir[PATH_MAX];

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index da479d7a154076a6e7090339515f8eeb9fb36df0..5ddd1976e293f2550e2691d721bbd38a3cbb510a 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -424,10 +424,6 @@ void create_spool_dirs(void) {
                syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
        if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0)
                syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
-       if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST))
-               syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno));
-       if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0)
-               syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno));
 }
 
 

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index dca1e3d61985614f1071d60275514ecd3a278c27..a642ac8060906f03825237faef4077cbc8079bb2 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -41,7 +41,6 @@ char ctdl_autoetc_dir[PATH_MAX]="";
 /* attention! this may be non volatile on some oses */
 char ctdl_run_dir[PATH_MAX]="";
 char ctdl_spool_dir[PATH_MAX]="network";
-char ctdl_netout_dir[PATH_MAX]="network/spoolout";
 char ctdl_netdigest_dir[PATH_MAX]="network/digest";
 char ctdl_nettmp_dir[PATH_MAX]="network/spooltmp";
 char ctdl_netcfg_dir[PATH_MAX]="netconfigs";
@@ -174,12 +173,10 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
        basedir=SPOOL_DIR;
 #endif
        COMPUTE_DIRECTORY(ctdl_spool_dir);
-       COMPUTE_DIRECTORY(ctdl_netout_dir);
        COMPUTE_DIRECTORY(ctdl_netdigest_dir);
        COMPUTE_DIRECTORY(ctdl_nettmp_dir);
 
        StripSlashes(ctdl_spool_dir, 1);
-       StripSlashes(ctdl_netout_dir, 1);
        StripSlashes(ctdl_netdigest_dir, 1);
        StripSlashes(ctdl_nettmp_dir, 1);
 
@@ -292,7 +289,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
        DBG_PRINT(ctdl_etc_dir);
        DBG_PRINT(ctdl_run_dir);
        DBG_PRINT(ctdl_spool_dir);
-       DBG_PRINT(ctdl_netout_dir);
        DBG_PRINT(ctdl_netdigest_dir);
        DBG_PRINT(ctdl_nettmp_dir);
        DBG_PRINT(ctdl_netcfg_dir);
@@ -401,7 +397,6 @@ int create_run_directories(long UID, long GID)
        rv += create_dir(ctdl_message_dir   , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_file_dir      , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_spool_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
-       rv += create_dir(ctdl_netout_dir    , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_netdigest_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_nettmp_dir    , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_key_dir       , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);