X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimage%2Fserv_image.c;fp=citadel%2Fmodules%2Fimage%2Fserv_image.c;h=a7960b10097ebb0697e8c350baa62d1dbb573856;hb=4f16550e3fe10c62b691b3976ff8b4fccc9dd830;hp=367814e9f699177b060f80d475a21af4375d3c8d;hpb=41746d2f898e3a111e49d59ff3dfcd9d7e575994;p=citadel.git

diff --git a/citadel/modules/image/serv_image.c b/citadel/modules/image/serv_image.c
index 367814e9f..a7960b100 100644
--- a/citadel/modules/image/serv_image.c
+++ b/citadel/modules/image/serv_image.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -297,8 +297,7 @@ void import_old_userpic_files(void)
 		free(d);
 		return;
 	}
-	while ((readdir_r(filedir, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
 	{
 #ifdef _DIRENT_HAVE_D_NAMLEN
 		d_namelen = filedir_entry->d_namlen;