|
 |
450e7ef |
diff -up cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize cyrus-imapd-2.3.15/lib/auth_unix.c
|
|
|
450e7ef |
--- cyrus-imapd-2.3.15/lib/auth_unix.c.authid_normalize 2009-09-18 11:53:47.183115911 +0200
|
|
|
450e7ef |
+++ cyrus-imapd-2.3.15/lib/auth_unix.c 2009-09-18 11:53:47.252115833 +0200
|
|
|
450e7ef |
@@ -156,10 +156,12 @@ const char *identifier;
|
|
 |
cf58a5c |
size_t len;
|
|
|
cf58a5c |
{
|
|
|
cf58a5c |
static char retbuf[81];
|
|
|
cf58a5c |
+ char backup[81];
|
|
|
cf58a5c |
struct group *grp;
|
|
|
cf58a5c |
char sawalpha;
|
|
|
cf58a5c |
char *p;
|
|
|
cf58a5c |
int username_tolower = 0;
|
|
|
cf58a5c |
+ int ic,rbc;
|
|
|
cf58a5c |
|
|
|
cf58a5c |
if(!len) len = strlen(identifier);
|
|
|
cf58a5c |
if(len >= sizeof(retbuf)) return NULL;
|
|
|
450e7ef |
@@ -211,6 +213,22 @@ size_t len;
|
|
|
cf58a5c |
/* now we don't */
|
|
|
cf58a5c |
/* if (!sawalpha) return NULL; */
|
|
|
cf58a5c |
|
|
|
cf58a5c |
+ if( (libcyrus_config_getswitch(CYRUSOPT_NORMALIZEUID) == 1) ) {
|
|
|
cf58a5c |
+ strcpy(backup,retbuf);
|
|
|
cf58a5c |
+ /* remove leading blanks */
|
|
|
cf58a5c |
+ for(ic=0; isblank(backup[ic]); ic++);
|
|
|
cf58a5c |
+ for(rbc=0; backup[ic]; ic++) {
|
|
|
cf58a5c |
+ retbuf[rbc] = ( isalpha(backup[ic]) ?
|
|
|
cf58a5c |
+ tolower(backup[ic]) : backup[ic] );
|
|
|
cf58a5c |
+ rbc++;
|
|
|
cf58a5c |
+ }
|
|
|
cf58a5c |
+ retbuf[rbc] = '\0';
|
|
|
cf58a5c |
+ /* remove trailing blanks */
|
|
|
cf58a5c |
+ for(--rbc; isblank(retbuf[rbc]); rbc--) {
|
|
|
cf58a5c |
+ retbuf[rbc] = '\0';
|
|
|
cf58a5c |
+ }
|
|
|
cf58a5c |
+ }
|
|
|
cf58a5c |
+
|
|
|
cf58a5c |
return retbuf;
|
|
|
cf58a5c |
}
|
|
|
cf58a5c |
|
|
|
450e7ef |
diff -up cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize cyrus-imapd-2.3.15/lib/imapoptions
|
|
|
450e7ef |
--- cyrus-imapd-2.3.15/lib/imapoptions.authid_normalize 2009-09-18 11:53:47.244115877 +0200
|
|
|
450e7ef |
+++ cyrus-imapd-2.3.15/lib/imapoptions 2009-09-18 11:53:47.260115873 +0200
|
|
|
450e7ef |
@@ -1217,6 +1217,11 @@ product version in the capabilities */
|
|
|
cf58a5c |
interface, otherwise the user is assumed to be in the default
|
|
|
cf58a5c |
domain (if set). */
|
|
|
cf58a5c |
|
|
|
cf58a5c |
+{ "normalizeuid", 0, SWITCH }
|
|
|
cf58a5c |
+/* Lowercase uid and strip leading and trailing blanks. It is recommended
|
|
|
cf58a5c |
+ to set this to yes, especially if OpenLDAP is used as authentication
|
|
|
cf58a5c |
+ source. */
|
|
|
cf58a5c |
+
|
|
|
cf58a5c |
/*
|
|
|
cf58a5c |
.SH SEE ALSO
|
|
|
cf58a5c |
.PP
|
|
|
450e7ef |
diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.c
|
|
|
450e7ef |
--- cyrus-imapd-2.3.15/lib/libcyr_cfg.c.authid_normalize 2009-03-31 06:43:20.000000000 +0200
|
|
|
450e7ef |
+++ cyrus-imapd-2.3.15/lib/libcyr_cfg.c 2009-09-18 11:55:03.436822867 +0200
|
|
|
450e7ef |
@@ -154,6 +154,10 @@ struct cyrusopt_s cyrus_options[] = {
|
|
|
450e7ef |
CFGVAL(long, 1),
|
|
|
a6d65f1 |
CYRUS_OPT_SWITCH },
|
|
|
cf58a5c |
|
|
|
cf58a5c |
+ { CYRUSOPT_NORMALIZEUID,
|
|
|
cf58a5c |
+ CFGVAL(long, 1),
|
|
|
cf58a5c |
+ CYRUS_OPT_SWITCH },
|
|
|
cf58a5c |
+
|
|
|
cf58a5c |
{ CYRUSOPT_LAST, { NULL }, CYRUS_OPT_NOTOPT }
|
|
|
cf58a5c |
};
|
|
|
cf58a5c |
|
|
|
450e7ef |
diff -up cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize cyrus-imapd-2.3.15/lib/libcyr_cfg.h
|
|
|
450e7ef |
--- cyrus-imapd-2.3.15/lib/libcyr_cfg.h.authid_normalize 2009-03-31 06:43:20.000000000 +0200
|
|
|
450e7ef |
+++ cyrus-imapd-2.3.15/lib/libcyr_cfg.h 2009-09-18 11:55:33.267115989 +0200
|
|
|
450e7ef |
@@ -114,6 +114,8 @@ enum cyrus_opt {
|
|
|
450e7ef |
CYRUSOPT_SQL_USESSL,
|
|
|
450e7ef |
/* Checkpoint after every recovery (OFF) */
|
|
|
450e7ef |
CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT,
|
|
|
450e7ef |
+ /* Lowercase uid and strip leading and trailing blanks (OFF) */
|
|
|
450e7ef |
+ CYRUSOPT_NORMALIZEUID,
|
|
|
450e7ef |
|
|
|
450e7ef |
CYRUSOPT_LAST
|
|
|
450e7ef |
|