Index: doc/Makefile.in --- doc/Makefile.in.orig 2004-01-12 05:52:20 +0100 +++ doc/Makefile.in 2005-10-10 23:21:46 +0200 @@ -447,18 +447,18 @@ install-data-local: - @if test -f $(sysconfdir)/cpu.conf ; then \ - echo "$@ will not overwrite existing $(sysconfdir)/cpu.conf"; \ + @if test -f $(DESTDIR)$(sysconfdir)/cpu.conf ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/cpu.conf"; \ else \ - $(mkinstalldirs) $(sysconfdir); \ - echo "$(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf"; \ - $(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf; \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ + echo "$(INSTALL_DATA) cpu.conf $(DESTDIR)$(sysconfdir)/cpu.conf"; \ + $(INSTALL_DATA) cpu.conf $(DESTDIR)$(sysconfdir)/cpu.conf; \ fi uninstall-local: - @if test -f $(sysconfdir)/cpu.conf ; then \ - echo "rm -f $(sysconfdir)/cpu.conf"; \ - $(RM) -f $(sysconfdir)/cpu.conf; \ + @if test -f $(DESTDIR)$(sysconfdir)/cpu.conf ; then \ + echo "rm -f $(DESTDIR)$(sysconfdir)/cpu.conf"; \ + $(RM) -f $(DESTDIR)$(sysconfdir)/cpu.conf; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: src/plugins/ldap/commandline.c --- src/plugins/ldap/commandline.c.orig 2004-01-12 06:31:02 +0100 +++ src/plugins/ldap/commandline.c 2005-10-10 23:40:07 +0200 @@ -83,7 +83,7 @@ if (passent == NULL) return -1; bzero (passent, sizeof (struct cpass)); - (int) passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; + passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; passent->sp_warn = passent->sp_inact = passent->sp_expire = -10; passent->sp_flag = -10; passent->pw_gid = -10; Index: src/plugins/ldap/ld.c --- src/plugins/ldap/ld.c.orig 2004-01-12 05:47:37 +0100 +++ src/plugins/ldap/ld.c 2005-10-10 23:45:34 +0200 @@ -803,7 +803,8 @@ return -10; if (gid != NULL) { - gid = ldap_get_values (ld, pos, gid)[0]; + temp = ldap_get_values (ld, pos, gid); + gid = (char *)temp[0]; if (gid != NULL) return atoi (gid); else