Package: ldapscripts
Version: 1.4-2etch1
Severity: important
Tags: patch

/usr/share/ldapscripts/runtime uses 

-xH "$SERVER" in some cases and
-xH "ldap://$server"; in others.

This broke going from 1.4-2 -> 1.4-2etch1, and is not a problem in lenny's 
1.7.1-2

Anyways, replaced all instances of "ldap://$SERVER"; with just "$SERVER" to 
match 
the behaviour of lenny's package. Which enforces the use of an ldap URI in 
/etc/ldapscripts/ldapscripts.conf

--- /usr/share/ldapscripts/runtime.orig 2008-03-18 10:46:18.000000000 -0400
+++ /usr/share/ldapscripts/runtime      2008-03-18 11:07:37.000000000 -0400
@@ -126,16 +126,16 @@
   then
        if [ -z "$2" ] && [ -z "$3" ]
        then
-         $LDAPSEARCHBIN -y "$BINDPWDFILE" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"ldap://$SERVER"; -s sub -LLL 2>>"$LOGFILE"
+         $LDAPSEARCHBIN -y "$BINDPWDFILE" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"$SERVER" -s sub -LLL 2>>"$LOGFILE"
        else
-         $LDAPSEARCHBIN -y "$BINDPWDFILE" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"ldap://$SERVER"; -s sub -LLL "$2" "$3" 2>>"$LOGFILE"
+         $LDAPSEARCHBIN -y "$BINDPWDFILE" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"$SERVER" -s sub -LLL "$2" "$3" 2>>"$LOGFILE"
        fi
   else
        if [ -z "$2" ] && [ -z "$3" ]
        then
-         $LDAPSEARCHBIN -w "$BINDPWD" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"ldap://$SERVER"; -s sub -LLL 2>>"$LOGFILE"
+         $LDAPSEARCHBIN -w "$BINDPWD" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"$SERVER" -s sub -LLL 2>>"$LOGFILE"
        else
-         $LDAPSEARCHBIN -w "$BINDPWD" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"ldap://$SERVER"; -s sub -LLL "$2" "$3" 2>>"$LOGFILE"
+         $LDAPSEARCHBIN -w "$BINDPWD" -D "$BINDDN" -b "${1:-$SUFFIX}" -xH 
"$SERVER" -s sub -LLL "$2" "$3" 2>>"$LOGFILE"
        fi
   fi
 }
@@ -188,9 +188,9 @@
   [ -z "$1" ] && end_die "_ldapdelete : missing argument"
   if [ -n "$BINDPWDFILE" ]
   then
-     $LDAPDELETEBIN -y "$BINDPWDFILE" -D "$BINDDN" -xH "ldap://$SERVER"; -r 
"$1" 2>>"$LOGFILE" 1>/dev/null
+     $LDAPDELETEBIN -y "$BINDPWDFILE" -D "$BINDDN" -xH "$SERVER" -r "$1" 
2>>"$LOGFILE" 1>/dev/null
   else
-     $LDAPDELETEBIN -w "$BINDPWD" -D "$BINDDN" -xH "ldap://$SERVER"; -r "$1" 
2>>"$LOGFILE" 1>/dev/null
+     $LDAPDELETEBIN -w "$BINDPWD" -D "$BINDDN" -xH "$SERVER" -r "$1" 
2>>"$LOGFILE" 1>/dev/null
   fi
 }
 
@@ -362,12 +362,12 @@
       # Generate password file
       echo "$1" > "$_TMPFILE" || end_die "Error writing to temporary file 
$_TMPFILE"
       # Change password
-      $LDAPPASSWDBIN -y "$BINDPWDFILE" -D "$BINDDN" -xH "ldap://$SERVER"; -T 
"$_TMPFILE" "$2" 2>>"$LOGFILE" 1>/dev/null
+      $LDAPPASSWDBIN -y "$BINDPWDFILE" -D "$BINDDN" -xH "$SERVER" -T 
"$_TMPFILE" "$2" 2>>"$LOGFILE" 1>/dev/null
       # Release temp file
       reltempf
     else
       ## Change password in the unsecure, old-fashioned way
-      $LDAPPASSWDBIN -w "$BINDPWD" -D "$BINDDN" -xH "ldap://$SERVER"; -s "$1" 
"$2" 2>>"$LOGFILE" 1>/dev/null
+      $LDAPPASSWDBIN -w "$BINDPWD" -D "$BINDDN" -xH "$SERVER" -s "$1" "$2" 
2>>"$LOGFILE" 1>/dev/null
     fi


-- System Information:
Debian Release: etch
Architecture: amd64 

Kernel: Linux 2.6.18-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages ldapscripts depends on:
ii  ldap-utils    2.3.30-5      OpenLDAP utilities
ii  libnss-ldap   251-7.5       NSS module for using LDAP as a naming servic
ii  libpam-ldap   180-1.7       Pluggable Authentication Module allowing LDA
ii  sharutils     4.2.1-15      shar, unshar, uuencode, uudecode
ii  slapd         2.3.30-5      OpenLDAP server (slapd)

ldapscripts recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to