fix dnamlen, they missed the e, so we need to follow.

diff --git a/citadel/config.c b/citadel/config.c
index 25b7f66e27026650f3dd678eec28f07132b9ec04..3d6527f38db4a8e50970d706cc8124d0d05727d7 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -228,14 +228,16 @@ void put_config(void)
        FILE *cfp;
        int blocks_written = 0;
 
-       if ((cfp = fopen(file_citadel_config, "w")) != NULL) {
+       cfp = fopen(file_citadel_config, "w");
+       if (cfp != NULL) {
                blocks_written = fwrite((char *) &config, sizeof(struct config), 1, cfp);
                if (blocks_written == 1) {
-                       fclose(cfp);
                        chown(file_citadel_config, CTDLUID, (-1));
                        chmod(file_citadel_config, 0600);
+                       fclose(cfp);
                        return;
                }
+               fclose(cfp);
        }
        syslog(LOG_EMERG, "%s: %s", file_citadel_config, strerror(errno));
 }

diff --git a/citadel/modules/bio/serv_bio.c b/citadel/modules/bio/serv_bio.c
index 041485d933f0afb5767d73399cd3a34e340b6908..ea88b87d36da0ed953fb7a4d8b9cbbc94bb1c1d3 100644 (file)
--- a/citadel/modules/bio/serv_bio.c
+++ b/citadel/modules/bio/serv_bio.c
@@ -113,7 +113,7 @@ void cmd_lbio(char *cmdbuf)
               (filedir_entry != NULL))
        {
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
+               d_namelen = filedir_entry->d_namlen;
 
 #else
                d_namelen = strlen(filedir_entry->d_name);

diff --git a/citadel/modules/ctdlproto/serv_rooms.c b/citadel/modules/ctdlproto/serv_rooms.c
index 2755da8162ee2d69b49a854c2d314e8edf79b97c..deeeb813360d9874d8d9d7863ac174b1b66066a9 100644 (file)
--- a/citadel/modules/ctdlproto/serv_rooms.c
+++ b/citadel/modules/ctdlproto/serv_rooms.c
@@ -427,7 +427,7 @@ void cmd_rdir(char *cmdbuf)
                if (strcasecmp(filedir_entry->d_name, "filedir") && filedir_entry->d_name[0] != '.')
                {
 #ifdef _DIRENT_HAVE_D_NAMELEN
-                       d_namelen = filedir_entry->d_namelen;
+                       d_namelen = filedir_entry->d_namlen;
 #else
                        d_namelen = strlen(filedir_entry->d_name);
 #endif

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index e5ca89a4de30d5f8530648301ea57b04abc8f852..62afec686cb53afa4307133f25e5b9ce4c180893 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -720,7 +720,7 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n
               (filedir_entry != NULL))
        {
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
+               d_namelen = filedir_entry->d_namlen;
 
 #else
                d_namelen = strlen(filedir_entry->d_name);
@@ -824,7 +824,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
               (filedir_entry != NULL))
        {
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
+               d_namelen = filedir_entry->d_namlen;
 
 #else
                d_namelen = strlen(filedir_entry->d_name);

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index b673d389eea570dfdb8e79f56c61216195e1e58f..d2a39c6c63e11cd1b2e1d02af343c4b631b6e9b1 100644 (file)
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -443,7 +443,7 @@ void LoadAllNetConfigs(void)
               (filedir_entry != NULL))
        {
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
+               d_namelen = filedir_entry->d_namlen;
 #else
                d_namelen = strlen(filedir_entry->d_name);
 #endif

diff --git a/webcit/icontheme.c b/webcit/icontheme.c
index d8c9984fb89ab3a6573e7cf5e2573bc355bd8cee..28643aedb1dca8ac50d1cb00c4ea526ba808cfa2 100644 (file)
--- a/webcit/icontheme.c
+++ b/webcit/icontheme.c
@@ -84,7 +84,7 @@ int LoadThemeDir(const char *DirName)
               (filedir_entry != NULL))
        {
 #ifdef _DIRENT_HAVE_D_NAMELEN
-               d_namelen = filedir_entry->d_namelen;
+               d_namelen = filedir_entry->d_namlen;
                d_type = filedir_entry->d_type;
 #else
 

diff --git a/webcit/static.c b/webcit/static.c
index a1a6251fc1be72b8a50e7b3779c482567ce90a1d..ba4977d357e9a14bcaec323fefcf9cc4257313e0 100644 (file)
--- a/webcit/static.c
+++ b/webcit/static.c
@@ -183,7 +183,7 @@ int LoadStaticDir(const char *DirName, HashList *DirList, const char *RelDir)
               (filedir_entry != NULL))
        {
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
+               d_namelen = filedir_entry->d_namlen;
 
 #else
                d_namelen = strlen(filedir_entry->d_name);

diff --git a/webcit/subst.c b/webcit/subst.c
index 167a94d35999544270c0f0e84fb66931995c9331..7f9026229cb602eea7c5baefd4acee388cdff1c2 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1526,8 +1526,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
                char *MinorPtr;
 
 #ifdef _DIRENT_HAVE_D_NAMLEN
-               d_namelen = filedir_entry->d_namelen;
-
+               d_namelen = filedir_entry->d_namlen;
 #else
                d_namelen = strlen(filedir_entry->d_name);
 #endif