[Pkg-citadel-commit] r199 - in webcit/trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2009-02-12 12:10:15 +0000 (Thu, 12 Feb 2009)
New Revision: 199

Added:
   webcit/trunk/debian/patches/r6951_empty_user.diff
Modified:
   webcit/trunk/debian/changelog
   webcit/trunk/debian/patches/series
Log:
Added upstream patch r6951 to make webcit autheticate even for users without a real name.



Modified: webcit/trunk/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog	2009-02-12 12:08:31 UTC (rev 198)
+++ webcit/trunk/debian/changelog	2009-02-12 12:10:15 UTC (rev 199)
@@ -1,3 +1,10 @@
+webcit (7.38b-dfsg-2) unstable; urgency=low
+
+  * [r6951] added upstream patch to make webcit authenticate even if no real
+    name is given, closes: #507871
+
+ -- Michael Meskes <meskes at debian.org>  Thu, 12 Feb 2009 13:09:24 +0100
+
 webcit (7.38b-dfsg-1) unstable; urgency=low
 
   * New upstream version.

Added: webcit/trunk/debian/patches/r6951_empty_user.diff
===================================================================
--- webcit/trunk/debian/patches/r6951_empty_user.diff	                        (rev 0)
+++ webcit/trunk/debian/patches/r6951_empty_user.diff	2009-02-12 12:10:15 UTC (rev 199)
@@ -0,0 +1,36 @@
+Index: citadel-7.38/modules/vcard/serv_vcard.c
+===================================================================
+--- citadel-7.38/modules/vcard/serv_vcard.c	(Revision 6950)
++++ citadel-7.38/modules/vcard/serv_vcard.c	(Revision 6951)
+@@ -997,8 +997,9 @@
+ #ifdef SOLARIS_GETPWUID
+ 		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) {
+ #else // SOLARIS_GETPWUID
+-		struct passwd **result = NULL;
+-		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, result) == 0) {
++		struct passwd *result = NULL;
++		CtdlLogPrintf(CTDL_DEBUG, "Searching for uid %d\n", usbuf->uid);
++		if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) {
+ #endif // HAVE_GETPWUID_R
+ 			snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn);
+ 			vcard_add_prop(v, "email;internet", buf);
+Index: citadel-7.38/user_ops.c
+===================================================================
+--- citadel-7.38/user_ops.c	(Revision 6950)
++++ citadel-7.38/user_ops.c	(Revision 6951)
+@@ -1062,14 +1062,7 @@
+ 			uid = pd.pw_uid;
+ 			if (IsEmptyStr (username))
+ 			{
+-				CtdlLogPrintf (CTDL_EMERG, 
+-					 "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n", 
+-					 newusername, pd.pw_uid);
+-				snprintf(buf, SIZ, 
+-					 "Can't find Realname for user %s [%d] in the Host Auth Database; giving up.\n",
+-					 newusername, pd.pw_uid);
+-				aide_message(buf, "User Creation Failure Notice");
+-
++				safestrncpy(username, pd.pw_name, sizeof username);
+ 			}
+ 		}
+ 		else {

Modified: webcit/trunk/debian/patches/series
===================================================================
--- webcit/trunk/debian/patches/series	2009-02-12 12:08:31 UTC (rev 198)
+++ webcit/trunk/debian/patches/series	2009-02-12 12:10:15 UTC (rev 199)
@@ -1,2 +1 @@
-
-
+r6951_empty_user.diff