Attachment 156634 Details for Bug 237356 – cvs diff ldap/admin/src/cfg_sspt.c

[patch] cvs diff ldap/admin/src/cfg_sspt.c

ldapserver.diff (text/plain), 13.53 KB, created by Noriko Hosoi on 2007-06-09 00:37:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-09 00:37:01 UTC

Size: 13.53 KB

patch

obsolete

>Index: ldap/admin/src/cfg_sspt.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.c,v
>retrieving revision 1.12
>diff -t -w -U4 -r1.12 cfg_sspt.c
>--- ldap/admin/src/cfg_sspt.c	7 Jun 2007 22:40:14 -0000	1.12
>+++ ldap/admin/src/cfg_sspt.c	9 Jun 2007 00:30:41 -0000
>@@ -92,16 +92,13 @@
> char* const name_c                       = "c";
> char* const name_st                      = "st";
> char* const name_l                       = "l";
> 
>-char* const value_configAdminGroupCN     = "Configuration Administrators";
>-char* const value_configAdminGroupRDN = "cn=Configuration Administrators";
>+char* const name_netscaperootDN          = "o=NetscapeRoot";
>+
> char* const value_configAdminCN       = "Configuration Administrator";
> char* const value_configAdminSN       = "Administrator";
> char* const value_configAdminGN       = "Configuration";
>-char* const value_globalPreferencesOU    = "Global Preferences";
>-char* const value_hostPreferencesOU      = "Host Preferences";
>-char* const value_netscapeConfigDesc  = "Standard branch for configuration information";
> char* const value_peopleOU                       = "People";
> char* const value_peopleDesc                     = "Standard branch for people (uid) entries";
> char* const value_groupsOU                       = "Groups";
> char* const value_groupsDesc                     = "Standard Branch for group entries";
>@@ -111,16 +108,8 @@
> #endif /* TEST_CONFIG */
> 
> char* dbg_log_file                       = "ds_sscfg.log";
> 
>-char* const name_netscaperoot                    = "NetscapeRoot";
>-char* const name_netscaperootDN                  = "o=NetscapeRoot";
>-char* const name_topology                        = "TopologyManagement";
>-char* const name_topologyRDN             = "ou=TopologyManagement";
>-char* const value_topologyDESC   = "Branch for Configuration Administration users and groups";
>-char* const name_administratorsOU                = "Administrators";
>-char* const name_administratorsRDN               = "ou=Administrators";
>-char* const value_administratorsDESC     = "Standard branch for Configuration Administrator (uid) entries";
> char* const name_localDAGroup                    = "Directory Administrators";
> char* const value_localDAGroupDesc               = "Entities with administrative access to this directory server";
> 
> static char* const ACI_self_allow = "(targetattr=\""
>@@ -993,72 +982,8 @@
> 
>         return ret;
> }
> 
>-static int
>-create_NetscapeRoot(LDAP* ld, const char *DN)
>-{
>-/*
>-  dn: o=NetscapeRoot
>-  o: NetscapeRoot
>-  objectclass: top
>-  objectclass: organization
>-  */
>-        int err;
>-        int ret = 0;
>-
>-#ifdef CGI_DEBUG
>-        debug_log (dbg_log_file, "create_NetscapeRoot()\n");
>-#endif
>-
>-        if (ld == NULL)
>-        {
>-                return -1;
>-        }
>-
>-        if (!entry_exists(ld, DN))
>-        {
>-                LDAPMod* attrs[4];
>-                LDAPMod attr[3];
>-                char* objectClasses[4];
>-                char* names[2];
>-
>-                attrs[0] = &attr[0];
>-                attrs[3] = NULL;
>-                attr[0].mod_op = LDAP_MOD_ADD;
>-                attr[0].mod_type = name_objectClass;
>-                attr[0].mod_values = objectClasses;
>-                objectClasses[0] = class_top;
>-                objectClasses[1] = class_organization;
>-                objectClasses[2] = NULL;
>-                attrs[1] = &attr[1];
>-                attr[1].mod_op = LDAP_MOD_ADD;
>-                attr[1].mod_type = name_o;
>-                attr[1].mod_values = names;
>-                names[0] = name_netscaperoot;
>-                names[1] = NULL;
>-                attrs[2] = NULL;
>-
>-                /*      fprintf (stdout, "ldap_add_s(%s)<br>\n", DN); fflush (stdout); */
>-
>-                err = ldap_add_s (ld, DN, attrs);
>-
>-                if (err != LDAP_SUCCESS) 
>-                {
>-                        char* explanation = PR_smprintf("Unable to create %s."
>-                                                                                        " (%s (%i) returned from ldap_add_s(%s))",
>-                                                                                        name_netscaperoot, ldap_err2string (err), err,
>-                                                                                        DN);
>-                        ds_report_warning (DS_NETWORK_ERROR, " can't create NetscapeRoot",
>-                                                           explanation);
>-                        PR_smprintf_free (explanation);
>-                        ret = 1;
>-                }
>-
>-        }
>-
>-        return ret;
>-}
> 
> #ifdef TEST_CONFIG
> static int
> create_configEntry(LDAP* ld)
>@@ -1404,30 +1329,8 @@
> 
>         if (!(connection = do_bind (slapd, query->rootDN, query->rootPW)))
>                 return 1;
> 
>-        /* parent dn of admin uid entry */
>-        if (query->netscaperoot) {
>-                parentDN = make_dn("%s, %s, %s", name_administratorsRDN,
>-                                                   name_topologyRDN, query->netscaperoot, NULLSTR);
>-        }
>-
>-        if (query->config_admin_uid) {
>-                getUIDFromDN(query->config_admin_uid, realuid);
>-                if (realuid[0]) {
>-                        /* admid is already a DN */
>-                        configAdminDN = strdup(query->config_admin_uid);
>-                } else if (parentDN) {
>-                        /* create a DN for admid */
>-                        configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, NULLSTR);
>-                } else {
>-                        /* create one from scratch */
>-                        configAdminDN = make_dn("%s=%s, %s, %s, %s", name_uid, query->config_admin_uid,
>-                                                                        name_administratorsRDN, name_topologyRDN,
>-                                                                        name_netscaperootDN, NULLSTR);
>-                }
>-        }
>-
>         if (query->suffix)
>         {
>                 status = create_base(connection, query->suffix);
>                 if (!status)
>@@ -1447,18 +1350,8 @@
>                                                                         query->consumerDN, query->consumerPW);
> 
>         if (!status)
>         {
>-                /*
>-                  Give the Configuration Admin group access to the root DSE entries
>-                  */
>-                if (query->netscaperoot) {
>-                        adminGroupDN = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN,
>-                                                                   name_ou, value_groupsOU,
>-                                                                   name_topologyRDN,
>-                                                                   query->netscaperoot, NULLSTR);
>-                }
>-
>                 if (query->suffix)
>                 {
>                         localDAGroupDN = make_dn("cn=%s, %s", name_localDAGroup,
>                                                            query->suffix, NULLSTR);
>@@ -1490,116 +1383,8 @@
>                         }
>                 }
>         }
> 
>-        if (query->cfg_sspt)
>-        {
>-                /* create and set ACIs for o=netscaperoot entry */
>-                if (!status)
>-                        status = create_NetscapeRoot(connection, query->netscaperoot);
>-
>-                if (!status)
>-                        status = add_aci_v(connection, query->netscaperoot,
>-                                                           ACI_config_admin_group_allow_all,
>-                                                           value_configAdminGroupRDN,
>-                                                           name_ou, value_groupsOU, name_topologyRDN,
>-                                                           query->netscaperoot, NULLSTR);
>-
>-                if (!status)
>-                        status = add_aci_v(connection, query->netscaperoot,
>-                                                           ACI_anonymous_allow_with_filter,
>-                                                           query->netscaperoot, NULLSTR);
>-
>-                if (!status)
>-                        status = add_aci_v(connection, query->netscaperoot, ACI_group_expansion,
>-                                                           query->netscaperoot, NULLSTR);
>-
>-                /* create "topologyOU, netscaperoot" entry and set ACIs */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s, %s", name_topologyRDN,
>-                                                           query->netscaperoot, NULLSTR);
>-                        status = create_organizational_unit(connection, NULL, dn,
>-                                                                                                value_topologyDESC,
>-                                                                                                0, 0, 0);
>-
>-                        if (!status)
>-                                add_aci(connection, dn, ACI_anonymous_allow);
>-
>-                        free(dn);
>-                }
>-
>-                /* create "ou=Groups, ..." */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU,
>-                                                           name_topologyRDN, query->netscaperoot, NULLSTR);
>-                        status = create_organizational_unit (connection, NULL, dn,
>-                                                                                                 value_groupsDesc, 0, 0, 0);
>-                        free(dn);
>-                }
>-
>-                /* create "ou=Administrators, ..." */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s, %s, %s", name_administratorsRDN,
>-                                                           name_topologyRDN, query->netscaperoot, NULLSTR);
>-                        status = create_organizational_unit (connection, NULL, dn,
>-                                                                                                 value_administratorsDESC,
>-                                                                                                 0, 0, 0);
>-                        free(dn);
>-                }
>-
>-                /* create "cn=Configuration Administrators, ou=Groups, ..." */
>-                if (!status)
>-                {
>-                        char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU,
>-                                                           name_topologyRDN,
>-                                                           query->netscaperoot, NULLSTR);
>-                        status = create_group (connection, dn, value_configAdminGroupCN);
>-                        free(dn);
>-                }
>-
>-                /* create the ss admin user */
>-                if (!status && !is_root_user(query->ssAdmID, query))
>-                {
>-                        /* group to add the uid to */
>-                        char *groupdn = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN,
>-                                                                        name_ou, value_groupsOU, name_topologyRDN,
>-                                                                        query->netscaperoot, NULLSTR);
>-                        create_ssadmin_user(connection, parentDN,
>-                                                                query->ssAdmID, query->ssAdmPW1);
>-
>-                        status = add_group_member (connection, groupdn,
>-                                                                           name_uniqueMember, configAdminDN);
>-                        free (groupdn);
>-                }
>-
>-                admin_domainDN = make_dn("%s=%s, %s", name_ou, query->admin_domain,
>-                                                                 query->netscaperoot, NULLSTR);
>-
>-                if (!status)
>-                        status = create_organizational_unit (connection, 0,
>-                                                                                                 admin_domainDN,
>-                                                                                                 value_netscapeConfigDesc,
>-                                                                                                 class_adminDomain,
>-                                                                                                 name_adminDomain,
>-                                                                                                 query->admin_domain);
>-
>-                if (!status) {
>-                        status = create_organizational_unit(connection,
>-                                                                                                admin_domainDN,
>-                                                                                                value_globalPreferencesOU, 0,
>-                                                                                                0, 0, 0);
>-                }
>-                if (!status) {
>-                        status = create_organizational_unit(connection,
>-                                                                                                admin_domainDN,
>-                                                                                                value_hostPreferencesOU, 0,
>-                                                                                                0, 0, 0);
>-                }
>-        }
>-
> #ifdef TEST_CONFIG
>         if (!status && query->testconfig)
>                 status = create_configEntry(connection);
>

Actions: View | Diff

Attachments on bug 237356: 153230 | 153562 | 153667 | 153668 | 153674 | 153675 | 153677 | 153678 | 155103 | 155105 | 155406 | 155407 | 155408 | 155409 | 155410 | 155411 | 155412 | 155413 | 155414 | 155483 | 155484 | 155485 | 155486 | 155487 | 155488 | 155489 | 155490 | 156389 | 156510 | 156525 | 156539 | 156540 | 156541 | 156612 | 156613 | 156614 | 156626 | 156633 | 156634 | 156741 | 156829 | 156834 | 156839 | 156840 | 156895 | 157043 | 157044 | 157133 | 157159 | 157160 | 157164 | 157165 | 157167 | 157298 | 157378 | 157381 | 157388 | 157390 | 157400 | 157401 | 157407 | 157408 | 157429 | 157431 | 157469 | 157471 | 157479 | 157480 | 160762