fix 1636

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 49cd7b39..78055fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Wed Jan  5 15:20:11 CET 2011
         Fixing double-locking on non-Linux platforms when using
         MHD_create_response_from_fd (#1639). -CG
+        Avoid use of strndup for better portability (#1636). -CG
 
 Tue Jan  4 13:07:21 CET 2011
         Added MHD_create_response_from_buffer, deprecating
diff --git a/src/daemon/digestauth.c b/src/daemon/digestauth.c
index b6b1ccd8..dd87b251 100644
--- a/src/daemon/digestauth.c
+++ b/src/daemon/digestauth.c
@@ -689,7 +689,8 @@ MHD_basic_auth_get_username_password(struct MHD_Connection *connection,
       free(decode);
       return NULL;
     }
-  user = strndup(decode, separator - decode);
+  user = strdup(decode);
+  user[separator - decode] = '\0'; /* cut off at ':' */
   if (password != NULL) 
     {
       *password = strdup(separator + 1);