From d607b3218f5b608f28d769d5f82e3540b38c8330 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 7 Oct 2013 21:26:41 +0200
Subject: [PATCH] fix dnamlen, they missed the e, so we need to follow.

---
 citadel/config.c                        | 6 ++++--
 citadel/modules/bio/serv_bio.c          | 2 +-
 citadel/modules/network/serv_netspool.c | 4 ++--
 citadel/netconfig.c                     | 2 +-
 citadel/room_ops.c                      | 2 +-
 webcit/icontheme.c                      | 2 +-
 webcit/static.c                         | 2 +-
 webcit/subst.c                          | 3 +--
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/citadel/config.c b/citadel/config.c
index 4dc7698b4..aea5d4bf3 100644
--- 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 041485d93..ea88b87d3 100644
--- 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 02dbcabb2..8a8a1e401 100644
--- 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 d1a7539ff..be7ca6d2d 100644
--- 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 010fa1276..5a4d5503d 100644
--- 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 d8c9984fb..28643aedb 100644
--- 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 a1a6251fc..ba4977d35 100644
--- 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 167a94d35..7f9026229 100644
--- 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
-- 
2.30.2