diff options
Diffstat (limited to 'net/openldap22/files')
-rw-r--r-- | net/openldap22/files/manpages | 188 | ||||
-rw-r--r-- | net/openldap22/files/patch-build::ltmain.sh | 15 | ||||
-rw-r--r-- | net/openldap22/files/patch-libraries::liblutil::passwd.c | 14 | ||||
-rw-r--r-- | net/openldap22/files/patch-servers::slapd::daemon.c | 11 | ||||
-rw-r--r-- | net/openldap22/files/slapd.sh | 71 | ||||
-rw-r--r-- | net/openldap22/files/slurpd.sh | 64 |
6 files changed, 310 insertions, 53 deletions
diff --git a/net/openldap22/files/manpages b/net/openldap22/files/manpages new file mode 100644 index 000000000000..d3830d3afa8b --- /dev/null +++ b/net/openldap22/files/manpages @@ -0,0 +1,188 @@ +MAN1+= ldapcompare.1 \ + ldapdelete.1 \ + ldapmodify.1 \ + ldapmodrdn.1 \ + ldappasswd.1 \ + ldapsearch.1 \ + ldapwhoami.1 +MLINKS+= \ + ldapmodify.1 ldapadd.1 + +MAN3+= lber-decode.3 \ + lber-encode.3 \ + lber-memory.3 \ + lber-types.3 \ + ldap.3 \ + ldap_abandon.3 \ + ldap_add.3 \ + ldap_bind.3 \ + ldap_compare.3 \ + ldap_delete.3 \ + ldap_error.3 \ + ldap_first_attribute.3 \ + ldap_first_entry.3 \ + ldap_first_message.3 \ + ldap_first_reference.3 \ + ldap_get_dn.3 \ + ldap_get_values.3 \ + ldap_modify.3 \ + ldap_modrdn.3 \ + ldap_open.3 \ + ldap_parse_reference.3 \ + ldap_parse_result.3 \ + ldap_result.3 \ + ldap_schema.3 \ + ldap_search.3 \ + ldap_sort.3 \ + ldap_url.3 +MLINKS+= \ + lber-decode.3 ber_first_element.3 \ + lber-decode.3 ber_get_bitstring.3 \ + lber-decode.3 ber_get_boolean.3 \ + lber-decode.3 ber_get_enum.3 \ + lber-decode.3 ber_get_int.3 \ + lber-decode.3 ber_get_next.3 \ + lber-decode.3 ber_get_null.3 \ + lber-decode.3 ber_get_stringa.3 \ + lber-decode.3 ber_get_stringb.3 \ + lber-decode.3 ber_next_element.3 \ + lber-decode.3 ber_peek_tag.3 \ + lber-decode.3 ber_scanf.3 \ + lber-decode.3 ber_skip_tag.3 \ + lber-encode.3 ber_alloc_t.3 \ + lber-encode.3 ber_flush.3 \ + lber-encode.3 ber_printf.3 \ + lber-encode.3 ber_put_enum.3 \ + lber-encode.3 ber_put_int.3 \ + lber-encode.3 ber_put_null.3 \ + lber-encode.3 ber_put_ostring.3 \ + lber-encode.3 ber_put_seq.3 \ + lber-encode.3 ber_put_set.3 \ + lber-encode.3 ber_put_string.3 \ + lber-encode.3 ber_start_set.3 \ + lber-types.3 ber_bvarray_add.3 \ + lber-types.3 ber_bvarray_free.3 \ + lber-types.3 ber_bvdup.3 \ + lber-types.3 ber_bvecadd.3 \ + lber-types.3 ber_bvecfree.3 \ + lber-types.3 ber_bvfree.3 \ + lber-types.3 ber_bvstr.3 \ + lber-types.3 ber_bvstrdup.3 \ + lber-types.3 ber_dupbv.3 \ + lber-types.3 ber_free.3 \ + lber-types.3 ber_str2bv.3 \ + ldap_abandon.3 ldap_abandon_ext.3 \ + ldap_add.3 ldap_add_ext.3 \ + ldap_add.3 ldap_add_ext_s.3 \ + ldap_add.3 ldap_add_s.3 \ + ldap_bind.3 ldap_bind_s.3 \ + ldap_bind.3 ldap_kerberos_bind1.3 \ + ldap_bind.3 ldap_kerberos_bind1_s.3 \ + ldap_bind.3 ldap_kerberos_bind2.3 \ + ldap_bind.3 ldap_kerberos_bind2_s.3 \ + ldap_bind.3 ldap_kerberos_bind_s.3 \ + ldap_bind.3 ldap_sasl_bind.3 \ + ldap_bind.3 ldap_sasl_bind_s.3 \ + ldap_bind.3 ldap_simple_bind.3 \ + ldap_bind.3 ldap_simple_bind_s.3 \ + ldap_bind.3 ldap_unbind.3 \ + ldap_bind.3 ldap_unbind_ext.3 \ + ldap_bind.3 ldap_unbind_ext_s.3 \ + ldap_bind.3 ldap_unbind_s.3 \ + ldap_compare.3 ldap_compare_ext.3 \ + ldap_compare.3 ldap_compare_ext_s.3 \ + ldap_compare.3 ldap_compare_s.3 \ + ldap_delete.3 ldap_delete_ext.3 \ + ldap_delete.3 ldap_delete_ext_s.3 \ + ldap_delete.3 ldap_delete_s.3 \ + ldap_error.3 ld_errno.3 \ + ldap_error.3 ldap_err2string.3 \ + ldap_error.3 ldap_errlist.3 \ + ldap_error.3 ldap_perror.3 \ + ldap_error.3 ldap_result2error.3 \ + ldap_first_attribute.3 ldap_next_attribute.3 \ + ldap_first_entry.3 ldap_count_entries.3 \ + ldap_first_entry.3 ldap_next_entry.3 \ + ldap_first_message.3 ldap_count_messages.3 \ + ldap_first_message.3 ldap_next_message.3 \ + ldap_first_reference.3 ldap_count_references.3 \ + ldap_first_reference.3 ldap_next_reference.3 \ + ldap_get_dn.3 ldap_dcedn2dn.3 \ + ldap_get_dn.3 ldap_dn2ad_canonical.3 \ + ldap_get_dn.3 ldap_dn2dcedn.3 \ + ldap_get_dn.3 ldap_dn2str.3 \ + ldap_get_dn.3 ldap_dn2ufn.3 \ + ldap_get_dn.3 ldap_explode_dn.3 \ + ldap_get_dn.3 ldap_explode_rdn.3 \ + ldap_get_dn.3 ldap_str2dn.3 \ + ldap_get_values.3 ldap_count_values.3 \ + ldap_get_values.3 ldap_count_values_len.3 \ + ldap_get_values.3 ldap_get_values_len.3 \ + ldap_get_values.3 ldap_value_free.3 \ + ldap_get_values.3 ldap_value_free_len.3 \ + ldap_modify.3 ldap_modify_ext.3 \ + ldap_modify.3 ldap_modify_ext_s.3 \ + ldap_modify.3 ldap_modify_s.3 \ + ldap_modify.3 ldap_mods_free.3 \ + ldap_modrdn.3 ldap_modrdn2.3 \ + ldap_modrdn.3 ldap_modrdn2_s.3 \ + ldap_modrdn.3 ldap_modrdn_s.3 \ + ldap_open.3 ldap_init.3 \ + ldap_parse_result.3 ldap_parse_extended_result.3 \ + ldap_parse_result.3 ldap_parse_sasl_bind_result.3 \ + ldap_result.3 ldap_msgfree.3 \ + ldap_result.3 ldap_msgid.3 \ + ldap_result.3 ldap_msgtype.3 \ + ldap_schema.3 ldap_attributetype2name.3 \ + ldap_schema.3 ldap_attributetype2str.3 \ + ldap_schema.3 ldap_attributetype_free.3 \ + ldap_schema.3 ldap_matchingrule2name.3 \ + ldap_schema.3 ldap_matchingrule2str.3 \ + ldap_schema.3 ldap_matchingrule_free.3 \ + ldap_schema.3 ldap_objectclass2name.3 \ + ldap_schema.3 ldap_objectclass2str.3 \ + ldap_schema.3 ldap_objectclass_free.3 \ + ldap_schema.3 ldap_scherr2str.3 \ + ldap_schema.3 ldap_str2attributetype.3 \ + ldap_schema.3 ldap_str2matchingrule.3 \ + ldap_schema.3 ldap_str2objectclass.3 \ + ldap_schema.3 ldap_str2syntax.3 \ + ldap_schema.3 ldap_syntax2name.3 \ + ldap_schema.3 ldap_syntax2str.3 \ + ldap_schema.3 ldap_syntax_free.3 \ + ldap_search.3 ldap_search_ext.3 \ + ldap_search.3 ldap_search_ext_s.3 \ + ldap_search.3 ldap_search_s.3 \ + ldap_search.3 ldap_search_st.3 \ + ldap_sort.3 ldap_sort_entries.3 \ + ldap_sort.3 ldap_sort_strcasecmp.3 \ + ldap_sort.3 ldap_sort_values.3 \ + ldap_url.3 ldap_free_urldesc.3 \ + ldap_url.3 ldap_is_ldap_url.3 \ + ldap_url.3 ldap_url_parse.3 + +MAN5+= ldap.conf.5 \ + ldif.5 \ + slapd-bdb.5 \ + slapd-dnssrv.5 \ + slapd-ldap.5 \ + slapd-ldbm.5 \ + slapd-meta.5 \ + slapd-monitor.5 \ + slapd-null.5 \ + slapd-passwd.5 \ + slapd-perl.5 \ + slapd-shell.5 \ + slapd-sql.5 \ + slapd-tcl.5 \ + slapd.access.5 \ + slapd.conf.5 \ + slapd.plugin.5 \ + slapd.replog.5 + +MAN8+= slapadd.8 \ + slapcat.8 \ + slapd.8 \ + slapindex.8 \ + slappasswd.8 \ + slurpd.8 diff --git a/net/openldap22/files/patch-build::ltmain.sh b/net/openldap22/files/patch-build::ltmain.sh new file mode 100644 index 000000000000..502d6b5db739 --- /dev/null +++ b/net/openldap22/files/patch-build::ltmain.sh @@ -0,0 +1,15 @@ +--- build/ltmain.sh.orig Sun Feb 9 23:24:29 2003 ++++ build/ltmain.sh Fri Jun 20 21:37:02 2003 +@@ -4285,12 +4285,6 @@ + IFS="$save_ifs" + fi + +- # Install the pseudo-library for information purposes. +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- instname="$dir/$name"i +- $show "$install_prog $instname $destdir/$name" +- $run eval "$install_prog $instname $destdir/$name" || exit $? +- + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; diff --git a/net/openldap22/files/patch-libraries::liblutil::passwd.c b/net/openldap22/files/patch-libraries::liblutil::passwd.c new file mode 100644 index 000000000000..32de74e9ee11 --- /dev/null +++ b/net/openldap22/files/patch-libraries::liblutil::passwd.c @@ -0,0 +1,14 @@ +# +# ITS#2562: add missing arg to hash_lanman +# +--- libraries/liblutil/passwd.c.orig Fri May 2 13:29:29 2003 ++++ libraries/liblutil/passwd.c Sun Jun 22 03:08:18 2003 +@@ -632,7 +632,7 @@ + { + struct berval *hash; + +- hash = hash_lanman( scheme, cred ); ++ hash = hash_lanman( scheme, cred, text ); + return memcmp( &hash->bv_val[scheme->bv_len], passwd->bv_val, 32); + } + #endif /* SLAPD_LMHASH */ diff --git a/net/openldap22/files/patch-servers::slapd::daemon.c b/net/openldap22/files/patch-servers::slapd::daemon.c new file mode 100644 index 000000000000..96afa46ebd8a --- /dev/null +++ b/net/openldap22/files/patch-servers::slapd::daemon.c @@ -0,0 +1,11 @@ +--- servers/slapd/daemon.c.orig Sat May 24 21:12:20 2003 ++++ servers/slapd/daemon.c Sun Jun 22 19:26:22 2003 +@@ -858,7 +858,7 @@ + #ifdef LDAP_PF_LOCAL + case AF_LOCAL: { + char *addr = ((struct sockaddr_un *)*sal)->sun_path; +-#if 0 /* don't muck with socket perms */ ++#if 1 + if ( chmod( addr, l.sl_perms ) < 0 && crit ) { + int err = sock_errno(); + #ifdef NEW_LOGGING diff --git a/net/openldap22/files/slapd.sh b/net/openldap22/files/slapd.sh index e8f6ed6b018d..21bdf775a0b1 100644 --- a/net/openldap22/files/slapd.sh +++ b/net/openldap22/files/slapd.sh @@ -2,44 +2,57 @@ # # $FreeBSD$ -slapd_program=@@PREFIX@@/libexec/slapd +slapd_program=%%PREFIX%%/libexec/slapd -# Uncomment one of the following: -# -# IPv4 Only -#slapd_args='-u ldap -g ldap -h ldap://0.0.0.0' +slapd_pidfile=%%LDAP_RUN_DIR%%/slapd.pid + +slapd_enable="NO" + +slapd_args= + +# Add the following lines to /etc/rc.conf to enable slapd: # -# IPv6 and IPv4 -#slapd_ags='-u ldap -g ldap -h "ldap://[::] ldap://0.0.0.0"' +#slapd_enable="YES" +#slapd_args='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/????x-mod=0777 ldap://0.0.0.0/"' # -# IPv6 Only -#slapd_args='-u ldap -g ldap -h ldap://[::]' +# See sldap(8) for details # +# Create a user 'ldap' and add '-u ldap -g ldap' to slapd_args +# if you want to run slapd as a non-privileged user (recommended) # -slapd_args="-u ldap -g ldap" - -pidfile=/var/run/ldap/slapd.pid -case "$1" in -start) - if [ -x $slapd ]; then - echo -n ' slapd' - eval ${slapd_program} ${slapd_args} +# Suck in the configuration variables. +if [ -r /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf + source_rc_confs +elif [ -r /etc/rc.conf ]; then + . /etc/rc.conf +fi - fi - ;; -stop) - if [ -f $pidfile ]; then - kill `cat $pidfile` - echo -n ' slapd' - rm $pidfile - else - echo ' slapd: not running' - fi +case "$slapd_enable" in +[Yy][Ee][Ss]) + case "$1" in + start) + if [ -x ${slapd_program} ]; then + echo -n ' slapd' + eval ${slapd_program} ${slapd_args} + fi + ;; + stop) + if [ -f $slapd_pidfile ]; then + kill `cat $slapd_pidfile` + echo -n ' slapd' + else + echo ' slapd: not running' + fi + ;; + *) + echo "Usage: `basename $0` {start|stop}" >&2 + exit 64 + ;; + esac ;; *) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 ;; esac diff --git a/net/openldap22/files/slurpd.sh b/net/openldap22/files/slurpd.sh index 9f347253a5d6..fc9f88f21cd6 100644 --- a/net/openldap22/files/slurpd.sh +++ b/net/openldap22/files/slurpd.sh @@ -1,34 +1,50 @@ #!/bin/sh # # $FreeBSD$ + +slurpd_program=%%PREFIX%%/libexec/slurpd + +slurpd_enable="NO" + +slurpd_args= + +# Add the following line to /etc/rc.conf to enable slurpd: +# +#slurpd_enable="YES" +# +# See slurpd(8) for details # -slurpd=@@PREFIX@@/libexec/slurpd -pidfile=/var/run/ldap/slurpd.pid +# Suck in the configuration variables. +if [ -r /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf + source_rc_confs +elif [ -r /etc/rc.conf ]; then + . /etc/rc.conf +fi -case "$1" in -start) - if [ -x $slurpd ]; then - echo -n ' slurpd' - $slurpd & - echo $! > $pidfile - fi - ;; -stop) - pids=`ps xa | awk '/slurpd/{ print $1 }'` - for pid in $pids; do - kill $pid - echo -n " slurpd($pid)" - done - ;; -restart) - $0 stop - $0 start - ;; +case "$slurpd_enable" in +[Yy][Ee][Ss]) + case "$1" in + start) + if [ -x ${slurpd_program} ]; then + echo -n ' slurpd' + ${slurpd_program} ${slurpd_args} + fi + ;; + stop) + if ! killall `basename ${slurpd_program}`; then + echo ' slurpd: not running' + fi + ;; + *) + echo "Usage: `basename $0` {start|stop}" >&2 + exit 64 + ;; + esac + ;; *) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; + ;; esac exit 0 |