Attachment 158071 Details for Bug 244749 – cvs diff (ldapserver)

[patch] cvs diff (ldapserver)

create_instance.diffs (text/plain), 5.23 KB, created by Noriko Hosoi on 2007-06-27 22:01:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-27 22:01:00 UTC

Size: 5.23 KB

patch

obsolete

>Index: create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.60
>diff -t -w -U4 -r1.60 create_instance.c
>--- create_instance.c	22 Jun 2007 23:14:52 -0000	1.60
>+++ create_instance.c	27 Jun 2007 21:53:42 -0000
>@@ -300,11 +300,9 @@
>     
>     conf->start_server = "1";
>     conf->install_full_schema = 1;
>     conf->admin_domain = NULL;
>-    conf->config_ldap_url = NULL;
>     conf->user_ldap_url = NULL;
>-    conf->use_existing_config_ds = 0;
>     conf->use_existing_user_ds = 0;
>     conf->consumerdn = NULL;
>     conf->disable_schema_checking = NULL;
>     conf->install_ldif_file = NULL;
>@@ -3216,43 +3214,8 @@
>     fprintf(f, "nsim-statusgraphic: nsYIMStatusGraphic\n");
>     fprintf(f, "\n");
> #endif
> 
>-    /* enable pass thru authentication */
>-    if ((cf->use_existing_config_ds && cf->config_ldap_url) ||
>-        (cf->use_existing_user_ds && cf->user_ldap_url))
>-    {
>-        LDAPURLDesc *desc = 0;
>-        char *url = cf->use_existing_config_ds ? cf->config_ldap_url :
>-                                                 cf->user_ldap_url;
>-        if (url && !ldap_url_parse(url, &desc) && desc)
>-        {
>-            char *suffix = desc->lud_dn;
>-            char *service = !strncmp(url, "ldaps:", strlen("ldaps:")) ?
>-                "ldaps" : "ldap";
>-            if (cf->use_existing_config_ds)
>-            {
>-                suffix = cf->netscaperoot;
>-            }
>-
>-            suffix = ds_URL_encode(suffix);
>-            fprintf(f, "dn: cn=Pass Through Authentication,cn=plugins,cn=config\n");
>-            fprintf(f, "objectclass: top\n");
>-            fprintf(f, "objectclass: nsSlapdPlugin\n");
>-            fprintf(f, "objectclass: extensibleObject\n");
>-            fprintf(f, "cn: Pass Through Authentication\n");
>-            fprintf(f, "nsslapd-pluginpath: %s/libpassthru-plugin%s\n", cf->plugin_dir, shared_lib);
>-            fprintf(f, "nsslapd-plugininitfunc: passthruauth_init\n");
>-            fprintf(f, "nsslapd-plugintype: preoperation\n");
>-            fprintf(f, "nsslapd-pluginenabled: on\n");
>-            fprintf(f, "nsslapd-pluginarg0: %s://%s:%d/%s\n", service, desc->lud_host, desc->lud_port,
>-                    suffix);
>-            fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
>-            fprintf(f, "\n");
>-            free(suffix);
>-            ldap_free_urldesc(desc);
>-        }
>-    } else { /* just add the config, disabled */
>         fprintf(f, "dn: cn=Pass Through Authentication,cn=plugins,cn=config\n");
>         fprintf(f, "objectclass: top\n");
>         fprintf(f, "objectclass: nsSlapdPlugin\n");
>         fprintf(f, "objectclass: extensibleObject\n");
>@@ -3262,9 +3225,8 @@
>         fprintf(f, "nsslapd-plugintype: preoperation\n");
>         fprintf(f, "nsslapd-pluginenabled: off\n");
>         fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
>         fprintf(f, "\n");
>-    }
> 
> #ifdef ENABLE_PAM_PASSTHRU
> #if !defined( XP_WIN32 )
>     /* PAM Pass Through Auth plugin - off by default */
>@@ -4517,40 +4479,14 @@
>     }
> 
>     cf->admin_domain = ds_a_get_cgi_var("admin_domain", NULL, NULL);
> 
>-    if ((temp = ds_a_get_cgi_var("use_existing_config_ds", NULL, NULL))) {
>-        cf->use_existing_config_ds = atoi(temp);
>-    } else {
>-        cf->use_existing_config_ds = 1; /* there must already be one */
>-    }
>-
>     if ((temp = ds_a_get_cgi_var("use_existing_user_ds", NULL, NULL))) {
>         cf->use_existing_user_ds = atoi(temp);
>     } else {
>         cf->use_existing_user_ds = 0; /* we are creating it */
>     }
> 
>-    temp = ds_a_get_cgi_var("ldap_url", NULL, NULL);
>-    if (temp && !ldap_url_parse(temp, &desc) && desc)
>-    {
>-        char *suffix;
>-        int isSSL;
>-
>-        if (desc->lud_dn && *desc->lud_dn) { /* use given DN for netscaperoot suffix */
>-            cf->netscaperoot = strdup(desc->lud_dn);
>-            suffix = cf->netscaperoot;
>-        } else { /* use the default */
>-            suffix = dn_normalize_convert(strdup(cf->netscaperoot));
>-        }
>-        /* the config ds connection may require SSL */
>-        isSSL = !strncmp(temp, "ldaps:", strlen("ldaps:"));
>-        cf->config_ldap_url = PR_smprintf("ldap%s://%s:%d/%s",
>-                                          (isSSL ? "s" : ""), desc->lud_host,
>-                                          desc->lud_port, suffix);
>-        ldap_free_urldesc(desc);
>-    }
>-
>     /* if being called as a CGI, the user_ldap_url will be the directory
>        we're creating */
>     /* this is the directory we're creating, and we cannot create an ssl
>        directory, so we don't have to worry about ldap vs ldaps here */
>Index: create_instance.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.h,v
>retrieving revision 1.17
>diff -t -w -U4 -r1.17 create_instance.h
>--- create_instance.h	7 Jun 2007 21:23:54 -0000	1.17
>+++ create_instance.h	27 Jun 2007 21:53:42 -0000
>@@ -160,12 +160,10 @@
> 
>     char * start_server;
> 
>     char * admin_domain;
>-    char * config_ldap_url;
>     char * user_ldap_url;
>     int use_existing_user_ds;
>-    int use_existing_config_ds;
>     char * disable_schema_checking;
>     char * install_ldif_file;
>     char *adminport;
>     char *inst_dir;

Actions: View | Diff

Attachments on bug 244749: 157336 | 157497 | 157506 | 157508 | 157554 | 157578 | 157579 | 157588 | 157662 | 157664 | 157671 | 157769 | 157772 | 157779 | 157978 | 158034 | 158070 | 158071 | 158140 | 158148