[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.18.2.1, 1.18.2.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25575/admin/src

Modified Files:
      Tag: Directory71RtmBranch
	create_instance.c 
Log Message:
Resolves: #311851
Summary: Remove hard-coded SASL mappings and replace with regex mappings
Description: applied the patch to Directory71RtmBranch



Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Attic/create_instance.c,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- create_instance.c	26 Aug 2005 18:51:50 -0000	1.18.2.1
+++ create_instance.c	10 Jan 2008 01:12:19 -0000	1.18.2.2
@@ -3791,6 +3791,55 @@
     fprintf(f, "cn: replication\n");
     fprintf(f, "\n");
 
+	/* bugzilla 311851: Don't allow * to be inserted into SASL mapping search*/
+    fprintf(f, "dn: cn=sasl,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsContainer\n");
+    fprintf(f, "cn: sasl\n");
+    fprintf(f, "\n");
+
+    fprintf(f, "dn: cn=mapping,cn=sasl,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsContainer\n");
+    fprintf(f, "cn: mapping\n");
+    fprintf(f, "\n");
+
+    fprintf(f, "dn: cn=Kerberos uid mapping,cn=mapping,cn=sasl,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsSaslMapping\n");
+    fprintf(f, "cn: Kerberos uid mapping\n");
+    fprintf(f, "nsSaslMapRegexString: \\(.*\\)@\\(.*\\)\\.\\(.*\\)\n");
+    fprintf(f, "nsSaslMapBaseDNTemplate: dc=\\2,dc=\\3\n");
+    fprintf(f, "nsSaslMapFilterTemplate: (uid=\\1)\n");
+    fprintf(f, "\n");
+
+    fprintf(f, "dn: cn=rfc 2829 dn syntax,cn=mapping,cn=sasl,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsSaslMapping\n");
+    fprintf(f, "cn: rfc 2829 dn syntax\n");
+    fprintf(f, "nsSaslMapRegexString: ^dn:\\(.*\\)\n");
+    fprintf(f, "nsSaslMapBaseDNTemplate: \\1\n");
+    fprintf(f, "nsSaslMapFilterTemplate: (objectclass=*)\n");
+    fprintf(f, "\n");
+
+    fprintf(f, "dn: cn=rfc 2829 u syntax,cn=mapping,cn=sasl,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsSaslMapping\n");
+    fprintf(f, "cn: rfc 2829 u syntax\n");
+    fprintf(f, "nsSaslMapRegexString: ^u:\\(.*\\)\n");
+    fprintf(f, "nsSaslMapBaseDNTemplate: %s\n", cf->suffix);
+    fprintf(f, "nsSaslMapFilterTemplate: (uid=\\1)\n");
+    fprintf(f, "\n");
+
+    fprintf(f, "dn: cn=uid mapping,cn=mapping,cn=sasl,cn=config\n");
+    fprintf(f, "objectclass: top\n");
+    fprintf(f, "objectclass: nsSaslMapping\n");
+    fprintf(f, "cn: uid mapping\n");
+    fprintf(f, "nsSaslMapRegexString: ^[^:@]+$\n");
+    fprintf(f, "nsSaslMapBaseDNTemplate: %s\n", cf->suffix);
+    fprintf(f, "nsSaslMapFilterTemplate: (uid=&)\n");
+    fprintf(f, "\n");
+
     if( cf->replicationdn && *(cf->replicationdn) ) 
     {
         fprintf(f, "dn: cn=replication4,cn=replication,cn=config\n");