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

diff --git a/citadel/config.c b/citadel/config.c
index 4dc7698b45ec6420f1e385c54c48b4882a8adcd0..aea5d4bf3bac045fd701e85432a5c51172dbe867 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -206,14 +206,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/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 02dbcabb23f3f7664b95a45f63ca001daf57a1fe..8a8a1e401c439a2454b0a7fc319431c0f6179b01 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -725,7 +725,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);
@@ -829,7 +829,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 d1a7539ff2d721f7ffc9976450bbec42c8f74e3a..be7ca6d2d46ce5336d889998400487be588c5460 100644 (file)
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -442,7 +442,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/citadel/room_ops.c b/citadel/room_ops.c
index 010fa12766a3e617e9adbe6df7de2395e9d1bb20..5a4d5503d05bb9315c61b3d9021c440e87b2fabf 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1301,7 +1301,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/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