File authid_normalize.patch of Package cyrus-imapd

Overview Repositories Revisions Requests Users Attributes Meta

File authid_normalize.patch of Package cyrus-imapd (Revision 6f9e8fad4ced2ee03125bcdd2f1e9806)

Currently displaying revision 6f9e8fad4ced2ee03125bcdd2f1e9806 , Show latest

From 871e7bc8c06d59ec76cf6c3cae7c1bb58cb6c3c9 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhafer@suse.de>
Date: Wed, 13 Jan 2010 11:04:28 +0100
Subject: [PATCH] "normalizeuid" option for imapd.conf

Lowercase uid and strip leading and trailing blanks. It is recommended
to set this to yes, especially if OpenLDAP is used as authentication
source.

4 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/lib/auth_unix.c b/lib/auth_unix.c
index 3fb8e77..aece4b6 100644
--- a/lib/auth_unix.c
+++ b/lib/auth_unix.c
@@ -156,10 +156,12 @@ const char *identifier;
 size_t len;
 {
     static char retbuf[81];
+    char backup[81];
     struct group *grp;
     char sawalpha;
     char *p;
     int username_tolower = 0;
+    int ic,rbc;
 
     if(!len) len = strlen(identifier);
     if(len >= sizeof(retbuf)) return NULL;
@@ -211,6 +213,22 @@ size_t len;
     /* now we don't */
     /* if (!sawalpha) return NULL;  */
 
+    if( (libcyrus_config_getswitch(CYRUSOPT_NORMALIZEUID) == 1) ) {
+        strcpy(backup,retbuf);
+       /* remove leading blanks */
+       for(ic=0; isblank(backup[ic]); ic++);
+       for(rbc=0; backup[ic]; ic++) {
+            retbuf[rbc] = ( isalpha(backup[ic]) ?
+                 tolower(backup[ic]) : backup[ic] );
+            rbc++;
+       }
+       retbuf[rbc] = '\0';
+       /* remove trailing blanks */
+       for(--rbc; isblank(retbuf[rbc]); rbc--) {
+            retbuf[rbc] = '\0';
+       }
+    }
+
     return retbuf;
 }
 
diff --git a/lib/imapoptions b/lib/imapoptions
index 7cf08d9..06d9f2d 100644
--- a/lib/imapoptions
+++ b/lib/imapoptions
@@ -1274,6 +1274,11 @@ product version in the capabilities */
    interface, otherwise the user is assumed to be in the default
    domain (if set). */
 
+{ "normalizeuid", 1, SWITCH }
+/* Lowercase uid and strip leading and trailing blanks. It is recommended
+   to set this to yes, especially if OpenLDAP is used as authentication
+   source. */
+
 /*
 .SH SEE ALSO
 .PP
diff --git a/lib/libcyr_cfg.c b/lib/libcyr_cfg.c
index 2a3a19b..38e60ec 100644
--- a/lib/libcyr_cfg.c
+++ b/lib/libcyr_cfg.c
@@ -154,6 +154,11 @@ struct cyrusopt_s cyrus_options[] = {
       CFGVAL(long, 1),
       CYRUS_OPT_SWITCH },
 
+    { CYRUSOPT_NORMALIZEUID,
+      CFGVAL(long, 1),
+      CYRUS_OPT_SWITCH },
+
+
     { CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
 };
 
diff --git a/lib/libcyr_cfg.h b/lib/libcyr_cfg.h
index 2b351c5..91837a8 100644
--- a/lib/libcyr_cfg.h
+++ b/lib/libcyr_cfg.h
@@ -114,6 +114,8 @@ enum cyrus_opt {
     CYRUSOPT_SQL_USESSL,
     /* Checkpoint after every recovery (OFF) */
     CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
+    /* Lowercase uid and strip leading and trailing blanks (ON) */
+    CYRUSOPT_NORMALIZEUID,
 
     CYRUSOPT_LAST
     
-- 
1.6.4.2

Places

File authid_normalize.patch of Package cyrus-imapd (Revision 6f9e8fad4ced2ee03125bcdd2f1e9806)

Places