[Fedora-directory-commits] adminutil/m4 fhs.m4, NONE, 1.1 icu.m4, 1.1, 1.2 mozldap.m4, 1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminutil/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30346/adminutil/m4

Modified Files:
	icu.m4 mozldap.m4 
Added Files:
	fhs.m4 
Log Message:
Resolves: bug 234420
Bug Description: adminutil: Use FHS paths and general code cleanup
Reviewed by: nkinder (Thanks!)
Fix Description:
1) Added a propertydir parameter to Makefile.am.  This is where the .res files go.  This also gets baked into the code so that the library knows where to find them.
2) The icu code expects the .res files to be in a packagename directory - packagename/foo.res not packagename_foo.res.  I don't know how this ever worked.  I also added en_US.res and en.res - icu recommends having the actual locale file rather than just falling back to the default root.res - see http://icu-project.org/userguide/ResourceManagement.html
3) There was quite a bit of dead code that I got rid of
4) Fixed many compiler warnings
5) There were quite a few memory leaks.  The biggest one was probably in psetDelete, which did not actually delete the pset.  Another one was the resource string handling - this returns malloc'd memory, and was never freed.  I added the option to pass in a static sized buffer to hold the resource string - this may be truncated but we usually won't care.  There were several places where the code was calling PR_Free on a data structure pointer - doing a "shallow" free rather than a "deep" free of all of the pointers in the data structure.
6) I merged in configuration from dbswitch.conf and other config files so that we could get rid of them and just have adm.conf.  We'll have to take care of this during migration.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no



--- NEW FILE fhs.m4 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
#
# END COPYRIGHT BLOCK

AC_CHECKING(for FHS)

# check for --with-fhs
AC_MSG_CHECKING(for --with-fhs)
AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
[
  with_fhs=yes
],
AC_MSG_RESULT(no))

if test "$with_fhs" = "yes"; then
  AC_DEFINE([IS_FHS], [1], [Use FHS layout])
fi



Index: icu.m4
===================================================================
RCS file: /cvs/dirsec/adminutil/m4/icu.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu.m4	30 Oct 2006 19:25:23 -0000	1.1
+++ icu.m4	4 Apr 2007 19:37:41 -0000	1.2
@@ -92,7 +92,7 @@
   AC_PATH_PROG(ICU_CONFIG, icu-config)
   if test -n "$ICU_CONFIG"; then
     icu_lib=`$ICU_CONFIG --ldflags-searchpath`
-    icu_libdir = `$ICU_CONFIG --libdir`
+    icu_libdir=`$ICU_CONFIG --libdir`
     icu_inc=`$ICU_CONFIG --cppflags-searchpath`
     icu_bin=`$ICU_CONFIG --bindir`
     AC_MSG_RESULT([using system ICU])


Index: mozldap.m4
===================================================================
RCS file: /cvs/dirsec/adminutil/m4/mozldap.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozldap.m4	30 Oct 2006 19:25:23 -0000	1.1
+++ mozldap.m4	4 Apr 2007 19:37:41 -0000	1.2
@@ -76,21 +76,22 @@
   AC_MSG_CHECKING(for mozldap with pkg-config)
   AC_PATH_PROG(PKG_CONFIG, pkg-config)
   if test -n "$PKG_CONFIG"; then
-    if $PKG_CONFIG --exists mozldap6; then
-      ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6`
-      ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6`
-      ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//`
-      AC_MSG_RESULT([using system mozldap6])
+    if $PKG_CONFIG --exists mozldap; then
+      ldapsdk_name=mozldap
+    elif $PKG_CONFIG --exists mozldap6; then
+      ldapsdk_name=mozldap6
     else
       AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
     fi
+    ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $ldapsdk_name`
+    ldapsdk_lib=`$PKG_CONFIG --libs-only-L $ldapsdk_name`
+    ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $ldapsdk_name | sed -e s/-L// | sed -e s/\ *$//`
+    AC_MSG_RESULT([using system $ldapsdk_name])
   fi
 fi
 if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
   AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
 fi
-dnl default path for the ldap c sdk tools (see [210947] for more details)
-ldapsdk_bindir=/usr/lib/mozldap6
 
 dnl make sure the ldap sdk version is 6 or greater - we do not support
 dnl the old 5.x or prior versions - the ldap server code expects the new