Subject: pu: package nss-pam-ldapd/0.7.14 Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: pu Severity: normal Dear stable release team, I would like to upload a new release of nss-pam-ldapd for squeeze that fixes a few annoying bugs. These are all one or two-line changes that have been available in the development series for some time now. Attached is a debdiff. I would also like to have your feedback on whether #619881 is suitable for a squeeze update. It does introduce new functionality though it shouldn't affect much of the existing code: http://lists.arthurdejong.org/nss-pam-ldapd-commits/2010/msg00302.html The bug log itself contains some arguments from users for fixing this in squeeze. Thanks, -- -- arthur - adejong@debian.org - http://people.debian.org/~adejong --
diff -Nru nss-pam-ldapd-0.7.13/ChangeLog nss-pam-ldapd-0.7.14/ChangeLog --- nss-pam-ldapd-0.7.13/ChangeLog 2010-12-11 22:57:09.000000000 +0100 +++ nss-pam-ldapd-0.7.14/ChangeLog 2011-09-09 13:18:47.000000000 +0200 @@ -1,3 +1,42 @@ +2011-08-24 20:45 arthur + + * [r1516] ., nslcd/cfg.c: fix a problem with uninitialised memory + while parsing the tls_ciphers option (r1471 from development) + +2011-07-02 21:28 arthur + + * [r1477] ., nslcd/group.c, nslcd/passwd.c, nslcd/shadow.c: grow + static buffers so that they should be large enough (part of r1476 + from trunk) + +2011-06-05 09:18 arthur + + * [r1472] ., common/expr.c, tests/test_expr.c: handle expressions + where the expander function returns NULL (handle it as an empty + string) (r1471 from development) + +2011-06-05 08:55 arthur + + * [r1469] nslcd/myldap.c: fix r1465 to split attribute/value at + right place + +2011-05-21 14:54 arthur + + * [r1465] ., nslcd/myldap.c: fix problem with partial attribute + name matches in DN (e.g. uid vs. uidNumber) (thanks to Timothy + White for the fix) (r1464 from trunk) + +2011-04-22 10:03 arthur + + * [r1432] ., nslcd/myldap.c: report correct reported error from + ldap_abandon() (merge r1431 from development) + +2010-12-11 21:57 arthur + + * [r1323] ChangeLog, NEWS, configure.ac, debian/changelog, + man/nslcd.8.xml, man/nslcd.conf.5.xml, man/pam_ldap.8.xml: get + files ready for 0.7.13 release + 2010-12-11 20:11 arthur * [r1321] ., nslcd/pam.c: return correct kind of error code from diff -Nru nss-pam-ldapd-0.7.13/common/expr.c nss-pam-ldapd-0.7.14/common/expr.c --- nss-pam-ldapd-0.7.13/common/expr.c 2010-09-24 09:07:17.000000000 +0200 +++ nss-pam-ldapd-0.7.14/common/expr.c 2011-06-05 11:19:27.000000000 +0200 @@ -93,6 +93,8 @@ if (parse_name(str,ptr,varname,sizeof(varname))==NULL) return NULL; varvalue=expander(varname,expander_arg); + if (varvalue==NULL) + varvalue=""; if (str[*ptr]=='}') { /* simple substitute */ @@ -148,6 +150,8 @@ if (parse_name(str,ptr,varname,sizeof(varname))==NULL) return NULL; varvalue=expander(varname,expander_arg); + if (varvalue==NULL) + varvalue=""; if (strlen(varvalue)>=buflen) return NULL; strcpy(buffer,varvalue); diff -Nru nss-pam-ldapd-0.7.13/configure nss-pam-ldapd-0.7.14/configure --- nss-pam-ldapd-0.7.13/configure 2010-12-11 22:52:05.000000000 +0100 +++ nss-pam-ldapd-0.7.14/configure 2011-09-09 15:35:05.000000000 +0200 @@ -1,12 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for nss-pam-ldapd 0.7.13. +# Generated by GNU Autoconf 2.67 for nss-pam-ldapd 0.7.14. # # Report bugs to <nss-pam-ldapd-users@lists.arthurdejong.org>. # # Copyright (C) 2006 Luke Howard # Copyright (C) 2006 West Consulting -# Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong # # This configure script is derived from configure.ac which is free software; # you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -562,8 +562,8 @@ # Identity of this package. PACKAGE_NAME='nss-pam-ldapd' PACKAGE_TARNAME='nss-pam-ldapd' -PACKAGE_VERSION='0.7.13' -PACKAGE_STRING='nss-pam-ldapd 0.7.13' +PACKAGE_VERSION='0.7.14' +PACKAGE_STRING='nss-pam-ldapd 0.7.14' PACKAGE_BUGREPORT='nss-pam-ldapd-users@lists.arthurdejong.org' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nss-pam-ldapd 0.7.13 to adapt to many kinds of systems. +\`configure' configures nss-pam-ldapd 0.7.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1371,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nss-pam-ldapd 0.7.13:";; + short | recursive ) echo "Configuration of nss-pam-ldapd 0.7.14:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nss-pam-ldapd configure 0.7.13 +nss-pam-ldapd configure 0.7.14 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1494,7 +1494,7 @@ Copyright (C) 2006 Luke Howard Copyright (C) 2006 West Consulting -Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong This configure script is derived from configure.ac which is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -2045,7 +2045,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nss-pam-ldapd $as_me 0.7.13, which was +It was created by nss-pam-ldapd $as_me 0.7.14, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2393,7 +2393,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_MONTH="Dec 2010" +RELEASE_MONTH="Sep 2011" @@ -2541,8 +2541,8 @@ # display notice and initialize automake -{ $as_echo "$as_me:${as_lineno-$LINENO}: configuring nss-pam-ldapd 0.7.13" >&5 -$as_echo "$as_me: configuring nss-pam-ldapd 0.7.13" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: configuring nss-pam-ldapd 0.7.14" >&5 +$as_echo "$as_me: configuring nss-pam-ldapd 0.7.14" >&6;} am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -2981,7 +2981,7 @@ # Define the identity of the package. PACKAGE=nss-pam-ldapd - VERSION=0.7.13 + VERSION=0.7.14 cat >>confdefs.h <<_ACEOF @@ -8241,7 +8241,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nss-pam-ldapd $as_me 0.7.13, which was +This file was extended by nss-pam-ldapd $as_me 0.7.14, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8307,7 +8307,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nss-pam-ldapd config.status 0.7.13 +nss-pam-ldapd config.status 0.7.14 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -Nru nss-pam-ldapd-0.7.13/configure.ac nss-pam-ldapd-0.7.14/configure.ac --- nss-pam-ldapd-0.7.13/configure.ac 2010-12-11 22:47:55.000000000 +0100 +++ nss-pam-ldapd-0.7.14/configure.ac 2011-09-09 15:34:41.000000000 +0200 @@ -2,7 +2,7 @@ # # Copyright (C) 2006 Luke Howard # Copyright (C) 2006 West Consulting -# Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ AC_COPYRIGHT( [Copyright (C) 2006 Luke Howard Copyright (C) 2006 West Consulting -Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong This configure script is derived from configure.ac which is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -32,8 +32,8 @@ configure.ac file for more details.]) # initialize and set version and bugreport address -AC_INIT([nss-pam-ldapd],[0.7.13],[nss-pam-ldapd-users@lists.arthurdejong.org]) -RELEASE_MONTH="Dec 2010" +AC_INIT([nss-pam-ldapd],[0.7.14],[nss-pam-ldapd-users@lists.arthurdejong.org]) +RELEASE_MONTH="Sep 2011" AC_SUBST(RELEASE_MONTH) AC_CONFIG_SRCDIR([nslcd.h]) diff -Nru nss-pam-ldapd-0.7.13/debian/changelog nss-pam-ldapd-0.7.14/debian/changelog --- nss-pam-ldapd-0.7.13/debian/changelog 2010-12-11 22:51:11.000000000 +0100 +++ nss-pam-ldapd-0.7.14/debian/changelog 2011-09-09 14:08:44.000000000 +0200 @@ -1,3 +1,16 @@ +nss-pam-ldapd (0.7.14) stable; urgency=low + + * log correct error from ldap_abandon() + * fix problem with partial attribute name matches in DN (thanks Timothy + White) + * handle expressions where some variable would expand to NULL + * make buffer sizes consistent and grow all buffers holding string + representations of numbers to be able to hold 64-bit numbers + * fix a problem with uninitialised memory while parsing the tls_ciphers + option (closes: #638872) + + -- Arthur de Jong <adejong@debian.org> Fri, 09 Sep 2011 13:33:02 +0200 + nss-pam-ldapd (0.7.13) unstable; urgency=low * fix handling of idle_timelimit option diff -Nru nss-pam-ldapd-0.7.13/debian/copyright nss-pam-ldapd-0.7.14/debian/copyright --- nss-pam-ldapd-0.7.13/debian/copyright 2010-09-24 09:07:12.000000000 +0200 +++ nss-pam-ldapd-0.7.14/debian/copyright 2011-08-23 22:07:21.000000000 +0200 @@ -18,7 +18,7 @@ Copyright (C) 1997-2006 Luke Howard Copyright (C) 2006-2007 West Consulting - Copyright (C) 2006-2009 Arthur de Jong + Copyright (C) 2006-2011 Arthur de Jong Copyright (C) 2009 Howard Chu This library is free software; you can redistribute it and/or diff -Nru nss-pam-ldapd-0.7.13/man/nslcd.8 nss-pam-ldapd-0.7.14/man/nslcd.8 --- nss-pam-ldapd-0.7.13/man/nslcd.8 2010-12-11 22:48:59.000000000 +0100 +++ nss-pam-ldapd-0.7.14/man/nslcd.8 2011-09-09 15:37:16.000000000 +0200 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nslcd 8 "Dec 2010" "Version 0.7.13" "System Manager's Manual" +.TH nslcd 8 "Sep 2011" "Version 0.7.14" "System Manager's Manual" .SH NAME nslcd \- local LDAP name service daemon. .SH SYNOPSIS diff -Nru nss-pam-ldapd-0.7.13/man/nslcd.8.xml nss-pam-ldapd-0.7.14/man/nslcd.8.xml --- nss-pam-ldapd-0.7.13/man/nslcd.8.xml 2010-12-11 22:48:03.000000000 +0100 +++ nss-pam-ldapd-0.7.14/man/nslcd.8.xml 2011-09-09 15:34:50.000000000 +0200 @@ -6,7 +6,7 @@ nslcd.8.xml - docbook manual page for nslcd Copyright (C) 2006 West Consulting - Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -36,9 +36,9 @@ <refmeta> <refentrytitle>nslcd</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class="version">Version 0.7.13</refmiscinfo> + <refmiscinfo class="version">Version 0.7.14</refmiscinfo> <refmiscinfo class="manual">System Manager's Manual</refmiscinfo> - <refmiscinfo class="date">Dec 2010</refmiscinfo> + <refmiscinfo class="date">Sep 2011</refmiscinfo> </refmeta> <refnamediv id="name"> diff -Nru nss-pam-ldapd-0.7.13/man/nslcd.conf.5 nss-pam-ldapd-0.7.14/man/nslcd.conf.5 --- nss-pam-ldapd-0.7.13/man/nslcd.conf.5 2010-12-11 22:48:59.000000000 +0100 +++ nss-pam-ldapd-0.7.14/man/nslcd.conf.5 2011-09-09 15:37:15.000000000 +0200 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH nslcd.conf 5 "Dec 2010" "Version 0.7.13" "System Manager's Manual" +.TH nslcd.conf 5 "Sep 2011" "Version 0.7.14" "System Manager's Manual" .SH NAME nslcd.conf \- configuration file for LDAP nameservice daemon .SH DESCRIPTION diff -Nru nss-pam-ldapd-0.7.13/man/nslcd.conf.5.xml nss-pam-ldapd-0.7.14/man/nslcd.conf.5.xml --- nss-pam-ldapd-0.7.13/man/nslcd.conf.5.xml 2010-12-11 22:48:08.000000000 +0100 +++ nss-pam-ldapd-0.7.14/man/nslcd.conf.5.xml 2011-09-09 15:34:50.000000000 +0200 @@ -6,7 +6,7 @@ nslcd.conf.5.xml - docbook manual page for nslcd.conf Copyright (C) 1997-2005 Luke Howard - Copyright (C) 2007, 2008, 2009, 2010 Arthur de Jong + Copyright (C) 2007, 2008, 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -36,9 +36,9 @@ <refmeta> <refentrytitle>nslcd.conf</refentrytitle> <manvolnum>5</manvolnum> - <refmiscinfo class="version">Version 0.7.13</refmiscinfo> + <refmiscinfo class="version">Version 0.7.14</refmiscinfo> <refmiscinfo class="manual">System Manager's Manual</refmiscinfo> - <refmiscinfo class="date">Dec 2010</refmiscinfo> + <refmiscinfo class="date">Sep 2011</refmiscinfo> </refmeta> <refnamediv id="name"> diff -Nru nss-pam-ldapd-0.7.13/man/pam_ldap.8 nss-pam-ldapd-0.7.14/man/pam_ldap.8 --- nss-pam-ldapd-0.7.13/man/pam_ldap.8 2010-12-11 22:49:00.000000000 +0100 +++ nss-pam-ldapd-0.7.14/man/pam_ldap.8 2011-09-09 15:37:21.000000000 +0200 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pam_ldap 8 "Dec 2010" "Version 0.7.13" "System Manager's Manual" +.TH pam_ldap 8 "Sep 2011" "Version 0.7.14" "System Manager's Manual" .SH NAME pam_ldap \- PAM module for LDAP-based authentication .SH SYNOPSIS diff -Nru nss-pam-ldapd-0.7.13/man/pam_ldap.8.xml nss-pam-ldapd-0.7.14/man/pam_ldap.8.xml --- nss-pam-ldapd-0.7.13/man/pam_ldap.8.xml 2010-12-11 22:48:15.000000000 +0100 +++ nss-pam-ldapd-0.7.14/man/pam_ldap.8.xml 2011-09-09 15:34:50.000000000 +0200 @@ -5,7 +5,7 @@ <!-- pam_ldap.8.xml - docbook manual page for pam_ldap PAM module - Copyright (C) 2009, 2010 Arthur de Jong + Copyright (C) 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -35,9 +35,9 @@ <refmeta> <refentrytitle>pam_ldap</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class="version">Version 0.7.13</refmiscinfo> + <refmiscinfo class="version">Version 0.7.14</refmiscinfo> <refmiscinfo class="manual">System Manager's Manual</refmiscinfo> - <refmiscinfo class="date">Dec 2010</refmiscinfo> + <refmiscinfo class="date">Sep 2011</refmiscinfo> </refmeta> <refnamediv id="name"> diff -Nru nss-pam-ldapd-0.7.13/NEWS nss-pam-ldapd-0.7.14/NEWS --- nss-pam-ldapd-0.7.13/NEWS 2010-12-11 22:47:20.000000000 +0100 +++ nss-pam-ldapd-0.7.14/NEWS 2011-09-09 13:32:40.000000000 +0200 @@ -1,3 +1,16 @@ +changes from 0.7.13 to 0.7.14 +----------------------------- + +* log correct error from ldap_abandon() +* fix problem with partial attribute name matches in DN (thanks Timothy + White) +* handle expressions where some variable would expand to NULL +* make buffer sizes consistent and grow all buffers holding string + representations of numbers to be able to hold 64-bit numbers +* fix a problem with uninitialised memory while parsing the tls_ciphers + option + + changes from 0.7.12 to 0.7.13 ----------------------------- diff -Nru nss-pam-ldapd-0.7.13/nslcd/cfg.c nss-pam-ldapd-0.7.14/nslcd/cfg.c --- nss-pam-ldapd-0.7.13/nslcd/cfg.c 2010-09-24 09:07:16.000000000 +0200 +++ nss-pam-ldapd-0.7.14/nslcd/cfg.c 2011-08-24 22:49:05.000000000 +0200 @@ -5,7 +5,7 @@ Copyright (C) 1997-2005 Luke Howard Copyright (C) 2007 West Consulting - Copyright (C) 2007, 2008, 2009, 2010 Arthur de Jong + Copyright (C) 2007, 2008, 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -415,12 +415,10 @@ char **var) { check_argumentcount(filename,lnr,keyword,(*line!=NULL)&&(**line!='\0')); - if ((*var==NULL)||(strcmp(*var,*line)!=0)) - { - /* Note: we have a memory leak here if a single mapping is changed - multiple times in one config (deemed not a problem) */ - *var=xstrdup(*line); - } + /* Note: we have a memory leak here if a single mapping is changed + multiple times in one config (deemed not a problem) */ + *var=xstrdup(*line); + /* mark that we are at the end of the line */ *line=NULL; } diff -Nru nss-pam-ldapd-0.7.13/nslcd/group.c nss-pam-ldapd-0.7.14/nslcd/group.c --- nss-pam-ldapd-0.7.13/nslcd/group.c 2010-09-24 09:07:16.000000000 +0200 +++ nss-pam-ldapd-0.7.14/nslcd/group.c 2011-07-02 23:26:34.000000000 +0200 @@ -5,7 +5,7 @@ Copyright (C) 1997-2006 Luke Howard Copyright (C) 2006 West Consulting - Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -181,7 +181,7 @@ /* return the list of members */ static const char **getmembers(MYLDAP_ENTRY *entry,MYLDAP_SESSION *session) { - char buf[20]; + char buf[256]; int i; const char **values; SET *set; diff -Nru nss-pam-ldapd-0.7.13/nslcd/myldap.c nss-pam-ldapd-0.7.14/nslcd/myldap.c --- nss-pam-ldapd-0.7.13/nslcd/myldap.c 2010-12-10 15:42:51.000000000 +0100 +++ nss-pam-ldapd-0.7.14/nslcd/myldap.c 2011-06-05 11:19:27.000000000 +0200 @@ -581,7 +581,7 @@ log_log(LOG_DEBUG,"ldap_abandon()"); if (ldap_abandon(session->searches[i]->session->ld,session->searches[i]->msgid)) { - if (ldap_get_option(session->ld,LDAP_OPT_ERROR_NUMBER,&rc)==LDAP_SUCCESS) + if (ldap_get_option(session->ld,LDAP_OPT_ERROR_NUMBER,&rc)!=LDAP_SUCCESS) rc=LDAP_OTHER; log_log(LOG_WARNING,"ldap_abandon() failed to abandon search: %s",ldap_err2string(rc)); } @@ -1448,9 +1448,10 @@ /* nothing here */; /* ensure that we found an equals sign now */ if (exploded_rdn[i][j]!='=') + continue; j++; /* skip more spaces */ - for (j++;isspace(exploded_rdn[i][j]);j++) + for (;isspace(exploded_rdn[i][j]);j++) /* nothing here */; /* ensure that we're not at the end of the string */ if (exploded_rdn[i][j]=='\0') diff -Nru nss-pam-ldapd-0.7.13/nslcd/passwd.c nss-pam-ldapd-0.7.14/nslcd/passwd.c --- nss-pam-ldapd-0.7.13/nslcd/passwd.c 2010-09-24 09:07:16.000000000 +0200 +++ nss-pam-ldapd-0.7.14/nslcd/passwd.c 2011-07-02 23:22:31.000000000 +0200 @@ -5,7 +5,7 @@ Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting - Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -295,7 +295,7 @@ const char *passwd; uid_t uids[MAXUIDS_PER_ENTRY]; int numuids; - char gidbuf[10]; + char gidbuf[32]; gid_t gid; char gecos[100]; char homedir[100]; diff -Nru nss-pam-ldapd-0.7.13/nslcd/shadow.c nss-pam-ldapd-0.7.14/nslcd/shadow.c --- nss-pam-ldapd-0.7.13/nslcd/shadow.c 2010-09-24 09:07:16.000000000 +0200 +++ nss-pam-ldapd-0.7.14/nslcd/shadow.c 2011-07-02 23:23:03.000000000 +0200 @@ -5,7 +5,7 @@ Copyright (C) 1997-2005 Luke Howard Copyright (C) 2006 West Consulting - Copyright (C) 2006, 2007, 2008, 2009, 2010 Arthur de Jong + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -111,7 +111,7 @@ static long to_date(const char *date,const char *attr) { - char buffer[8]; + char buffer[32]; long value; char *tmp; size_t l; diff -Nru nss-pam-ldapd-0.7.13/tests/test_expr.c nss-pam-ldapd-0.7.14/tests/test_expr.c --- nss-pam-ldapd-0.7.13/tests/test_expr.c 2010-09-24 09:07:15.000000000 +0200 +++ nss-pam-ldapd-0.7.14/tests/test_expr.c 2011-06-05 11:19:26.000000000 +0200 @@ -68,6 +68,8 @@ { if (strcmp(name,"empty")==0) return ""; + if (strcmp(name,"null")==0) + return NULL; else return "foobar"; } @@ -79,6 +81,8 @@ assertstreq(buffer,"foobar"); assert(expr_parse("$empty",buffer,sizeof(buffer),expanderfn,NULL)!=NULL); assertstreq(buffer,""); + assert(expr_parse("$foo1+$null+$foo2",buffer,sizeof(buffer),expanderfn,NULL)!=NULL); + assertstreq(buffer,"foobar++foobar"); assert(expr_parse("${test1}\\$",buffer,sizeof(buffer),expanderfn,NULL)!=NULL); assertstreq(buffer,"foobar$"); assert(expr_parse("${test1:-default}",buffer,sizeof(buffer),expanderfn,NULL)!=NULL);
Attachment:
signature.asc
Description: This is a digitally signed message part