Attachment 148614 Details for Bug 229691 – new diffs

[patch] new diffs

cvsdiffs (text/plain), 10.05 KB, created by Rich Megginson on 2007-02-22 19:58:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-02-22 19:58:55 UTC

Size: 10.05 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.29
>diff -u -8 -r1.29 Makefile.am
>--- ldapserver/Makefile.am	22 Feb 2007 19:29:47 -0000	1.29
>+++ ldapserver/Makefile.am	22 Feb 2007 19:57:58 -0000
>@@ -80,23 +80,31 @@
> #------------------------
> sbin_PROGRAMS = ns-slapd
> 
> bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
> 	ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
> 
> server_LTLIBRARIES = libslapd.la libds_admin.la libns-dshttpd.la
> 
>+# this is how to add optional plugins
>+if enable_pam_passthru
>+LIBPAM_PASSTHRU_PLUGIN = libpam-passthru-plugin.la
>+endif
>+if enable_dna
>+LIBDNA_PLUGIN = libdna-plugin.la
>+endif
>+
> serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \
> 	libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \
>-	libdistrib-plugin.la libdna-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
>-	libpam-passthru-plugin.la libpassthru-plugin.la libpresence-plugin.la \
>+	libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \
>+	libpassthru-plugin.la libpresence-plugin.la \
> 	libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \
> 	libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \
>-	libviews-plugin.la
>+	libviews-plugin.la $(LIBPAM_PASSTHRU_PLUGIN) $(LIBDNA_PLUGIN)
> 
> nodist_property_DATA = ns-slapd.properties
> 
> noinst_PROGRAMS = makstrdb
> 
> noinst_LIBRARIES = libavl.a libldaputil.a
> 
> #------------------------
>Index: ldapserver/config.h.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/config.h.in,v
>retrieving revision 1.4
>diff -u -8 -r1.4 config.h.in
>--- ldapserver/config.h.in	19 Feb 2007 23:55:04 -0000	1.4
>+++ ldapserver/config.h.in	22 Feb 2007 19:57:58 -0000
>@@ -7,16 +7,25 @@
> #undef CPU_hppa
> 
> /* cpu type ia64 */
> #undef CPU_ia64
> 
> /* cpu type sparc */
> #undef CPU_sparc
> 
>+/* enable the dna plugin */
>+#undef ENABLE_DNA
>+
>+/* enable ldapi support in the server */
>+#undef ENABLE_LDAPI
>+
>+/* enable the pam passthru auth plugin */
>+#undef ENABLE_PAM_PASSTHRU
>+
> /* Define to 1 if you have the <arpa/inet.h> header file. */
> #undef HAVE_ARPA_INET_H
> 
> /* Define to 1 if your system has a working `chown' function. */
> #undef HAVE_CHOWN
> 
> /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
>    don't. */
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.21
>diff -u -8 -r1.21 configure.ac
>--- ldapserver/configure.ac	19 Feb 2007 23:55:04 -0000	1.21
>+++ ldapserver/configure.ac	22 Feb 2007 19:57:58 -0000
>@@ -46,40 +46,68 @@
> AC_TYPE_SIGNAL
> AC_FUNC_STAT
> AC_FUNC_STRERROR_R
> AC_FUNC_STRFTIME
> AC_FUNC_VPRINTF
> AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
> 
> AC_MSG_CHECKING(for --enable-debug)
>-AC_ARG_ENABLE(debug, [  --enable-debug         Enable debug features],
>+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug features (default: no)]),
> [
>   AC_MSG_RESULT(yes)
>   debug_defs="-DDEBUG -DMCC_DEBUG"
> ],
> [
>   AC_MSG_RESULT(no)
>   debug_defs=""
> ])
> AC_SUBST([debug_defs])
> 
> # Used for legacy style packaging where we bundle all of the dependencies.
> AC_MSG_CHECKING(for --enable-bundle)
>-AC_ARG_ENABLE(bundle, [  --enable-bundle      Enable bundled dependencies],
>+AC_ARG_ENABLE(bundle, AS_HELP_STRING([--enable-bundle], [Enable bundled dependencies (default: no)]),
> [
>   AC_MSG_RESULT(yes)
>   bundle="1";
> ],
> [
>   AC_MSG_RESULT(no)
>   bundle="";
> ])
> AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
> 
>+# these enables are for optional or experimental features
>+enable_pam_passthru=yes
>+AC_ARG_ENABLE(pam-passthru,
>+        AS_HELP_STRING([--enable-pam-passthru],
>+                       [enable the PAM passthrough auth plugin (default: yes)]))
>+if test "$enable_pam_passthru" = yes ; then
>+   AC_DEFINE([ENABLE_PAM_PASSTHRU], [1], [enable the pam passthru auth plugin])
>+fi
>+AM_CONDITIONAL(enable_pam_passthru,test "$enable_pam_passthru" = "yes")
>+
>+enable_dna=yes
>+AC_ARG_ENABLE(dna,
>+        AS_HELP_STRING([--enable-dna],
>+                       [enable the Distributed Numeric Assignment (DNA) plugin (default: yes)]))
>+if test "$enable_dna" = yes ; then
>+   AC_DEFINE([ENABLE_DNA], [1], [enable the dna plugin])
>+fi
>+AM_CONDITIONAL(enable_dna,test "$enable_dna" = "yes")
>+
>+enable_ldapi=yes
>+AC_ARG_ENABLE(ldapi,
>+        AS_HELP_STRING([--enable-ldapi],
>+                       [enable LDAP over unix domain socket (LDAPI) support (default: yes)]))
>+if test "$enable_ldapi" = yes ; then
>+   AC_DEFINE([ENABLE_LDAPI], [1], [enable ldapi support in the server])
>+fi
>+
>+# the default prefix - override with --prefix or --with-fhs
> AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
> 
> m4_include(m4/fhs.m4)
> 
> # installation paths - by default, configure will just
> # use /usr as the prefix for everything, which means
> # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
> if test "$with_fhs" = "yes"; then
>@@ -114,17 +142,19 @@
> AC_SUBST(serverdir)
> AC_SUBST(serverplugindir)
> AC_SUBST(scripttemplatedir)
> 
> AC_CHECKING(for instconfigdir)
> 
> # check for --with-instconfigdir
> AC_MSG_CHECKING(for --with-instconfigdir)
>-AC_ARG_WITH(instconfigdir, [  --with-instconfigdir=/path   Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)],
>+AC_ARG_WITH(instconfigdir,
>+        AS_HELP_STRING([--with-instconfigdir=/path],
>+                       [Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)]),
> [
>   if test $withval = yes ; then
>      AC_ERROR([Please specify a full path with --with-instconfigdir])
>   fi
>   instconfigdir="$withval"
> ],
> [
>   dnl this value is expanded out in Makefile.am
>Index: ldapserver/ldap/admin/src/create_instance.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
>retrieving revision 1.44
>diff -u -8 -r1.44 create_instance.c
>--- ldapserver/ldap/admin/src/create_instance.c	9 Feb 2007 22:33:58 -0000	1.44
>+++ ldapserver/ldap/admin/src/create_instance.c	22 Feb 2007 19:58:02 -0000
>@@ -3144,17 +3144,18 @@
>     fprintf(f, "nsim-urlgraphicreturntype: BINARY\n");
>     fprintf(f, "nsim-requestmethod: GET\n");
>     fprintf(f, "nsim-statustext: nsYIMStatusText\n");
>     fprintf(f, "nsim-statusgraphic: nsYIMStatusGraphic\n");
>     fprintf(f, "\n");
> #endif
> 
>     /* enable pass thru authentication */
>-    if (cf->use_existing_config_ds || cf->use_existing_user_ds)
>+    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:")) ?
>@@ -3190,43 +3191,57 @@
>         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: off\n");
>         fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
>         fprintf(f, "\n");
>     }
> 
>-#ifdef BUILD_PAM_PASSTHRU
>+#ifdef ENABLE_PAM_PASSTHRU
> #if !defined( XP_WIN32 )
>     /* PAM Pass Through Auth plugin - off by default */
>     fprintf(f, "dn: cn=PAM Pass Through Auth,cn=plugins,cn=config\n");
>     fprintf(f, "objectclass: top\n");
>     fprintf(f, "objectclass: nsSlapdPlugin\n");
>     fprintf(f, "objectclass: extensibleObject\n");
>     fprintf(f, "objectclass: pamConfig\n");
>     fprintf(f, "cn: PAM Pass Through Auth\n");
>     fprintf(f, "nsslapd-pluginpath: %s/libpam-passthru-plugin%s\n", cf->plugin_dir, shared_lib);
>     fprintf(f, "nsslapd-plugininitfunc: pam_passthruauth_init\n");
>     fprintf(f, "nsslapd-plugintype: preoperation\n");
>-    fprintf(f, "nsslapd-pluginenabled: off\n");
>+    fprintf(f, "nsslapd-pluginenabled: on\n");
>     fprintf(f, "nsslapd-pluginLoadGlobal: true\n");
>     fprintf(f, "nsslapd-plugin-depends-on-type: database\n");
>     fprintf(f, "pamMissingSuffix: ALLOW\n");
>     if (cf->netscaperoot) {
>         fprintf(f, "pamExcludeSuffix: %s\n", cf->netscaperoot);
>     }
>     fprintf(f, "pamExcludeSuffix: cn=config\n");
>-    fprintf(f, "pamMapMethod: RDN\n");
>+    fprintf(f, "pamIDMapMethod: RDN\n");
>+    fprintf(f, "pamIDAttr: notUsedWithRDNMethod\n");
>     fprintf(f, "pamFallback: FALSE\n");
>     fprintf(f, "pamSecure: TRUE\n");
>     fprintf(f, "pamService: ldapserver\n");
>     fprintf(f, "\n");
> #endif /* NO PAM FOR WINDOWS */
>-#endif /* BUILD_PAM_PASSTHRU */
>+#endif /* ENABLE_PAM_PASSTHRU */
>+
>+#ifdef ENABLE_DNA
>+    fprintf(f, "dn: cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config\n");
>+    fprintf(f, "objectclass: top\n");
>+    fprintf(f, "objectclass: nsSlapdPlugin\n");
>+    fprintf(f, "objectclass: extensibleObject\n");
>+    fprintf(f, "objectclass: nsContainer\n");
>+    fprintf(f, "cn: Distributed Numeric Assignment Plugin\n");
>+    fprintf(f, "nsslapd-plugininitfunc: dna_init\n");
>+    fprintf(f, "nsslapd-plugintype: preoperation\n");
>+    fprintf(f, "nsslapd-pluginenabled: on\n");
>+    fprintf(f, "nsslapd-pluginPath: %s/libdna-plugin%s\n", cf->plugin_dir, shared_lib);
>+#endif /* ENABLE_DNA */
> 
>     fprintf(f, "dn: cn=ldbm database,cn=plugins,cn=config\n");
>     fprintf(f, "objectclass: top\n");
>     fprintf(f, "objectclass: nsSlapdPlugin\n");
>     fprintf(f, "objectclass: extensibleObject\n");
>     fprintf(f, "cn: ldbm database\n");
>     fprintf(f, "nsslapd-pluginpath: %s/libback-ldbm%s\n", cf->plugin_dir, shared_lib);
>     fprintf(f, "nsslapd-plugininitfunc: ldbm_back_init\n");

Actions: View | Diff

Attachments on bug 229691: 148613 | 148614 | 148627 | 148631 | 148636