[Fedora-directory-commits] ldapserver Makefile.am, 1.61, 1.62 aclocal.m4, 1.54, 1.55 configure, 1.70, 1.71 missing, 1.41, 1.42 install-sh, 1.41, 1.42 depcomp, 1.41, 1.42 compile, 1.40, 1.41 Makefile.in, 1.75, 1.76 config.sub, 1.40, 1.41 config.guess, 1.40, 1.41
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21756/ldapserver
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
Resolves: bug 165761
Added rfc2307bis schema, but in the data directory. It is not compatible with the older rfc2307 schema included with the directory server.
Users will need to upgrade their database to fix posixGroup entries in order
to use this schema
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Makefile.am 9 Oct 2007 18:30:38 -0000 1.61
+++ Makefile.am 11 Oct 2007 16:29:49 -0000 1.62
@@ -157,7 +157,8 @@
ldap/ldif/template-sasl.ldif \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
- $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
+ $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits \
+ $(srcdir)/ldap/schema/10rfc2307bis.ldif
schema_DATA = $(srcdir)/ldap/schema/00core.ldif \
$(srcdir)/ldap/schema/01common.ldif \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Makefile.in 9 Oct 2007 18:30:38 -0000 1.75
+++ Makefile.in 11 Oct 2007 16:29:49 -0000 1.76
@@ -1073,7 +1073,8 @@
ldap/ldif/template-sasl.ldif \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
$(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
- $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
+ $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits \
+ $(srcdir)/ldap/schema/10rfc2307bis.ldif
schema_DATA = $(srcdir)/ldap/schema/00core.ldif \
$(srcdir)/ldap/schema/01common.ldif \
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts setup-ds.res.in, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29450
Modified Files:
setup-ds.res.in
Log Message:
Resolves: bug 317651
Description: Clean up setup dialog text
Fix Description: Fixed usage of setup as a noun and set up as a verb. Also a few other items.
Index: setup-ds.res.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.res.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setup-ds.res.in 6 Aug 2007 18:41:40 -0000 1.10
+++ setup-ds.res.in 11 Oct 2007 14:10:00 -0000 1.11
@@ -7,13 +7,13 @@
dialog_use_different_type = When using Silent or Express mode, some of the\ndialogs are skipped, but validation is still performed\non the default or given answers. You should run this program again and\nchoose Typical or Custom mode in order to provide a valid input\nfor the problem dialog.\n\n
# ------------ Welcome Dialog Resource ------------
-dialog_welcome_text = This program will setup the %s Directory Server.\n\nIt is recommended that you have "root" privilege to setup the software.\nTips for using this program:\n - Press "Enter" to choose the default and go to the next screen\n - Type "Control-B" then "Enter" to go back to the previous screen\n - Type "Control-C" to cancel the setup program\n - You can enter multiple items using commas to separate them.\n For example: 1, 2, 3 \n\n
+dialog_welcome_text = This program will set up the %s Directory Server.\n\nIt is recommended that you have "root" privilege to set up the software.\nTips for using this program:\n - Press "Enter" to choose the default and go to the next screen\n - Type "Control-B" then "Enter" to go back to the previous screen\n - Type "Control-C" to cancel the setup program\n\n
# %s -> brand
-dialog_welcome_prompt = Would you like to continue with setup?
+dialog_welcome_prompt = Would you like to continue with set up?
# ----------- License Dialog Resource -----------
-dialog_license_text = BY SETTING UP AND USING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY\nAND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE\nLICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS\nOF THIS AGREEMENT, PLEASE DO NOT SETUP OR USE THIS SOFTWARE.\n\n
+dialog_license_text = BY SETTING UP AND USING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY\nAND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE\nLICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS\nOF THIS AGREEMENT, PLEASE DO NOT SET UP OR USE THIS SOFTWARE.\n\n
dialog_license_prompt = Do you agree to the license terms?
@@ -25,7 +25,7 @@
dialog_dsktune_prompt = Would you like to continue?
# ----------- Setup Type Dialog Resource ----------------
-dialog_setuptype_text = Choose a setup type:\n\n 1. Express\n Allows you to quickly setup the servers using the most\n common options and pre-defined defaults. Useful for quick\n evaluation of the products.\n\n 2. Typical\n Allows you to specify common defaults and options.\n\n 3. Custom\n Allows you to specify more advanced options. This is \n recommended for experienced server administrators only.\n\nTo accept the default shown in brackets, press the Enter key.\n\n
+dialog_setuptype_text = Choose a setup type:\n\n 1. Express\n Allows you to quickly set up the servers using the most\n common options and pre-defined defaults. Useful for quick\n evaluation of the products.\n\n 2. Typical\n Allows you to specify common defaults and options.\n\n 3. Custom\n Allows you to specify more advanced options. This is \n recommended for experienced server administrators only.\n\nTo accept the default shown in brackets, press the Enter key.\n\n
dialog_setuptype_prompt = Choose a setup type
16 years, 6 months
[Fedora-directory-commits] adminserver/admserv/newinst/src setup-ds-admin.res.in, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29207
Modified Files:
setup-ds-admin.res.in
Log Message:
Resolves: bug 317651
Description: Clean up setup dialog text
Fix Description: Fixed usage of setup as a noun and set up as a verb. Also a few other items.
Index: setup-ds-admin.res.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.res.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- setup-ds-admin.res.in 20 Sep 2007 21:47:28 -0000 1.8
+++ setup-ds-admin.res.in 11 Oct 2007 14:07:03 -0000 1.9
@@ -1,6 +1,6 @@
# this overrides the default
# ------------ Welcome Dialog Resource ------------
-dialog_welcome_text = This program will setup the %s Directory and Administration Servers.\n\nIt is recommended that you have "root" privilege to setup the software.\nTips for using this program:\n - Press "Enter" to choose the default and go to the next screen\n - Type "Control-B" then "Enter" to go back to the previous screen\n - Type "Control-C" to cancel the setup program\n - You can enter multiple items using commas to separate them.\n For example: 1, 2, 3 \n\n
+dialog_welcome_text = This program will set up the %s Directory and Administration Servers.\n\nIt is recommended that you have "root" privilege to set up the software.\nTips for using this program:\n - Press "Enter" to choose the default and go to the next screen\n - Type "Control-B" then "Enter" to go back to the previous screen\n - Type "Control-C" to cancel the setup program\n\n
# %s -> brand
# this overrides the default
@@ -8,7 +8,7 @@
dialog_ssuser_text = The servers must run as a specific user in a specific group.\nIt is strongly recommended that this user should have no privileges\non the computer (i.e. a non-root user). The setup procedure\nwill give this user/group some permissions in specific paths/files\nto perform server-specific operations.\n\nIf you have not yet created a user and group for the servers,\ncreate this user and group using your native operating\nsystem utilities.\n\n
# ----------- AS port Dialog Resource ----------------
-dialog_asport_text = The Administration Server is separate from any of your web or application\nservers since it listens to a different port and access to it is\nrestricted.\n\nPick a port number between 1024 and 65535 to run your Administration\nServer on. You should NOT use a port number which you plan to\nrun a web or application server on, rather, select a number which you\nwill remember and which will not be used for anything else.\n\nThe default in brackets was randomly selected from the available\nports on your system.\n\n
+dialog_asport_text = The Administration Server is separate from any of your web or application\nservers since it listens to a different port and access to it is\nrestricted.\n\nPick a port number between 1024 and 65535 to run your Administration\nServer on. You should NOT use a port number which you plan to\nrun a web or application server on, rather, select a number which you\nwill remember and which will not be used for anything else.\n\n
dialog_asport_prompt = Administration port
dialog_asport_error = The port %s is in use or not available. Please choose another port.\n\n
16 years, 6 months
[Fedora-directory-commits] adminutil configure.ac, 1.9, 1.10 aclocal.m4, 1.12, 1.13 configure, 1.12, 1.13 missing, 1.11, 1.12 install-sh, 1.11, 1.12 depcomp, 1.11, 1.12 config.sub, 1.11, 1.12 config.guess, 1.11, 1.12 compile, 1.11, 1.12 Makefile.in, 1.12, 1.13
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23143/adminutil
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
config.sub config.guess compile Makefile.in
Log Message:
bump version to 1.1.5
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.ac 11 Oct 2007 02:32:43 -0000 1.9
+++ configure.ac 11 Oct 2007 02:56:30 -0000 1.10
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.4], [http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.5], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure 11 Oct 2007 02:32:43 -0000 1.12
+++ configure 11 Oct 2007 02:56:30 -0000 1.13
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.4.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.5.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='adminutil'
PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='adminutil 1.1.4'
+PACKAGE_VERSION='1.1.5'
+PACKAGE_STRING='adminutil 1.1.5'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,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 adminutil 1.1.4 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of adminutil 1.1.4:";;
+ short | recursive ) echo "Configuration of adminutil 1.1.5:";;
esac
cat <<\_ACEOF
@@ -1182,7 +1182,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-adminutil configure 1.1.4
+adminutil configure 1.1.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1196,7 +1196,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by adminutil $as_me 1.1.4, which was
+It was created by adminutil $as_me 1.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1839,7 +1839,7 @@
# Define the identity of the package.
PACKAGE='adminutil'
- VERSION='1.1.4'
+ VERSION='1.1.5'
cat >>confdefs.h <<_ACEOF
@@ -24401,7 +24401,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by adminutil $as_me 1.1.4, which was
+This file was extended by adminutil $as_me 1.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24459,7 +24459,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-adminutil config.status 1.1.4
+adminutil config.status 1.1.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
16 years, 6 months
[Fedora-directory-commits] adminutil Makefile.am, 1.8, 1.9 configure.ac, 1.8, 1.9 aclocal.m4, 1.11, 1.12 configure, 1.11, 1.12 missing, 1.10, 1.11 install-sh, 1.10, 1.11 depcomp, 1.10, 1.11 compile, 1.10, 1.11 Makefile.in, 1.11, 1.12 config.sub, 1.10, 1.11 config.guess, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22701/adminutil
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
Log Message:
Resolves: bug 323381
Bug Description: Solaris: setup-ds-admin.pl fails due to extra ICU links
Reviewed by: nhosoi (Thanks!)
Fix Description: The problem is that when we link against libadminutil.la, libtool adds more -L paths to the link line, and in this case, it adds the path where libadminutil will be installed, which is /usr/lib/sparcv9. There appears to be no way to fix libtool. So the solution is to just use NSPR_LINK as the first link item and move libadminutil.la to the end. This will make sure that the path to nspr will always be first, which will either be $libdir/dirsec or $libdir. On the platforms where it is $libdir/dirsec, the correct version of ICU will either be in that directory, so it will link against that one first, or it will be installed in libdir, in which case it will be found.
Platforms tested: Solaris 9 64-bit
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 2 Aug 2007 03:18:03 -0000 1.8
+++ Makefile.am 11 Oct 2007 02:32:43 -0000 1.9
@@ -143,7 +143,7 @@
lib/libadmsslutil/uginfossl.c
libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) libadminutil.la
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
if CXXLINK_REQUIRED
libadmsslutil_la_LINK = $(CXXLINK)
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.ac 2 Aug 2007 03:18:03 -0000 1.8
+++ configure.ac 11 Oct 2007 02:32:43 -0000 1.9
@@ -106,6 +106,18 @@
AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
+# libtool automatically adds --rpath $libdir to each executable, and
+# there is apparently no standard way to disable this. Also, you cannot
+# override rpath with LD_LIBRARY_PATH, so this causes problems if you have
+# and old version of nss/nspr installed in the system $libdir, but you
+# want to use a different one. So we're disabling this rpath thing by
+# default and adding a --enable-rpath flag if you really, really want
+# to do this.
+AC_MSG_CHECKING(for --enable-rpath)
+enable_rpath=no
+AC_ARG_ENABLE(rpath, AS_HELP_STRING([--enable-rpath], [Allow libtool to add an rpath to $libdir (default: $enable_rpath)]))
+AC_MSG_RESULT($enable_rpath)
+
m4_include(m4/nspr.m4)
m4_include(m4/nss.m4)
m4_include(m4/mozldap.m4)
@@ -149,6 +161,17 @@
# cygnus, mingw, or the like and using cmd.exe as the shell
AM_CONDITIONAL([WINNT], false)
+if test "$enable_rpath" != "yes" ; then
+ AC_MSG_NOTICE([Fixing libtool to remove automatic rpath to $libdir . . .])
+ cp -p libtool libtool.orig
+ cp -p libtool libtool.tmp
+ sed -e '/^runpath_var/ d' \
+ -e '/^hardcode_libdir_flag_spec/ d' \
+ libtool > libtool.tmp
+ cp -p libtool.tmp libtool
+ rm -f libtool.tmp
+fi
+
AC_CONFIG_FILES([Makefile adminutil.pc])
AC_CONFIG_FILES([lib/libadminutil/genrb_wrapper])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 2 Aug 2007 03:18:03 -0000 1.11
+++ configure 11 Oct 2007 02:32:43 -0000 1.12
@@ -1040,6 +1040,8 @@
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-debug Enable debug features
--enable-tests Enable tests to be built (default: yes)
+ --enable-rpath Allow libtool to add an rpath to $libdir (default:
+ $enable_rpath)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4286,7 +4288,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4289 "configure"' > conftest.$ac_ext
+ echo '#line 4291 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5421,7 +5423,7 @@
# Provide some information about the compiler.
-echo "$as_me:5424:" \
+echo "$as_me:5426:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6484,11 +6486,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6487: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6489: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6491: \$? = $ac_status" >&5
+ echo "$as_me:6493: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6752,11 +6754,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6755: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6759: \$? = $ac_status" >&5
+ echo "$as_me:6761: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6856,11 +6858,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6859: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6863: \$? = $ac_status" >&5
+ echo "$as_me:6865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8325,7 +8327,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8328 "configure"' > conftest.$ac_ext
+ echo '#line 8330 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9222,7 +9224,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9225 "configure"
+#line 9227 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9322,7 +9324,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9325 "configure"
+#line 9327 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11665,11 +11667,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11672: \$? = $ac_status" >&5
+ echo "$as_me:11674: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11769,11 +11771,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11774: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11776: \$? = $ac_status" >&5
+ echo "$as_me:11778: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12305,7 +12307,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12308 "configure"' > conftest.$ac_ext
+ echo '#line 12310 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13363,11 +13365,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13366: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13368: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13370: \$? = $ac_status" >&5
+ echo "$as_me:13372: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13467,11 +13469,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13474: \$? = $ac_status" >&5
+ echo "$as_me:13476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14916,7 +14918,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14919 "configure"' > conftest.$ac_ext
+ echo '#line 14921 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15694,11 +15696,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15697: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15699: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15701: \$? = $ac_status" >&5
+ echo "$as_me:15703: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15962,11 +15964,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15965: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15967: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15969: \$? = $ac_status" >&5
+ echo "$as_me:15971: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16066,11 +16068,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16071: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16073: \$? = $ac_status" >&5
+ echo "$as_me:16075: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17535,7 +17537,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17538 "configure"' > conftest.$ac_ext
+ echo '#line 17540 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22937,6 +22939,24 @@
+# libtool automatically adds --rpath $libdir to each executable, and
+# there is apparently no standard way to disable this. Also, you cannot
+# override rpath with LD_LIBRARY_PATH, so this causes problems if you have
+# and old version of nss/nspr installed in the system $libdir, but you
+# want to use a different one. So we're disabling this rpath thing by
+# default and adding a --enable-rpath flag if you really, really want
+# to do this.
+echo "$as_me:$LINENO: checking for --enable-rpath" >&5
+echo $ECHO_N "checking for --enable-rpath... $ECHO_C" >&6
+enable_rpath=no
+# Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+
+fi;
+echo "$as_me:$LINENO: result: $enable_rpath" >&5
+echo "${ECHO_T}$enable_rpath" >&6
+
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -23863,6 +23883,8 @@
withval="$with_fhs"
with_fhs=yes
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
@@ -23920,6 +23942,18 @@
fi
+if test "$enable_rpath" != "yes" ; then
+ { echo "$as_me:$LINENO: Fixing libtool to remove automatic rpath to $libdir . . ." >&5
+echo "$as_me: Fixing libtool to remove automatic rpath to $libdir . . ." >&6;}
+ cp -p libtool libtool.orig
+ cp -p libtool libtool.tmp
+ sed -e '/^runpath_var/ d' \
+ -e '/^hardcode_libdir_flag_spec/ d' \
+ libtool > libtool.tmp
+ cp -p libtool.tmp libtool
+ rm -f libtool.tmp
+fi
+
ac_config_files="$ac_config_files Makefile adminutil.pc"
ac_config_files="$ac_config_files lib/libadminutil/genrb_wrapper"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 2 Aug 2007 03:18:03 -0000 1.11
+++ Makefile.in 11 Oct 2007 02:32:43 -0000 1.12
@@ -88,9 +88,9 @@
lib/libadminutil/libadminutil_la-strlist.lo \
lib/libadminutil/libadminutil_la-uginfo.lo
libadminutil_la_OBJECTS = $(am_libadminutil_la_OBJECTS)
-libadmsslutil_la_DEPENDENCIES = libadminutil.la $(am__DEPENDENCIES_1) \
+libadmsslutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libadminutil.la
am_libadmsslutil_la_OBJECTS = \
lib/libadmsslutil/libadmsslutil_la-admsslutil.lo \
lib/libadmsslutil/libadmsslutil_la-certmgt.lo \
@@ -417,7 +417,7 @@
lib/libadmsslutil/uginfossl.c
libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) libadminutil.la
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
@CXXLINK_REQUIRED_FALSE@libadmsslutil_la_LINK = $(LINK)
@CXXLINK_REQUIRED_TRUE@libadmsslutil_la_LINK = $(CXXLINK)
16 years, 6 months
[Fedora-directory-commits] adminutil/m4 fhs.m4,1.1,1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22701/adminutil/m4
Modified Files:
fhs.m4
Log Message:
Resolves: bug 323381
Bug Description: Solaris: setup-ds-admin.pl fails due to extra ICU links
Reviewed by: nhosoi (Thanks!)
Fix Description: The problem is that when we link against libadminutil.la, libtool adds more -L paths to the link line, and in this case, it adds the path where libadminutil will be installed, which is /usr/lib/sparcv9. There appears to be no way to fix libtool. So the solution is to just use NSPR_LINK as the first link item and move libadminutil.la to the end. This will make sure that the path to nspr will always be first, which will either be $libdir/dirsec or $libdir. On the platforms where it is $libdir/dirsec, the correct version of ICU will either be in that directory, so it will link against that one first, or it will be installed in libdir, in which case it will be found.
Platforms tested: Solaris 9 64-bit
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: fhs.m4
===================================================================
RCS file: /cvs/dirsec/adminutil/m4/fhs.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fhs.m4 4 Apr 2007 19:37:41 -0000 1.1
+++ fhs.m4 11 Oct 2007 02:32:44 -0000 1.2
@@ -25,6 +25,7 @@
AC_ARG_WITH(fhs, [ --with-fhs Use FHS layout],
[
with_fhs=yes
+ AC_MSG_RESULT(yes)
],
AC_MSG_RESULT(no))
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Migration.pm.in, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31708/ldapserver/ldap/admin/src/scripts
Modified Files:
Migration.pm.in
Log Message:
migration starts instances now
Index: Migration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Migration.pm.in 24 Sep 2007 22:54:47 -0000 1.7
+++ Migration.pm.in 10 Oct 2007 23:49:37 -0000 1.8
@@ -89,8 +89,7 @@
server root directory to their new FHS locations. This script does a
copy only - the data in the old instances will be left untouched. The
old instances must be shutdown first to ensure that the databases are
-copied safely. The new instances will not be started by migration,
-but can be started after running migration.
+copied safely. During migration your migrated instances will be started.
USAGE
16 years, 6 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff start-ds-admin.in, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1636/adminserver/admserv/cfgstuff
Modified Files:
start-ds-admin.in
Log Message:
Resolves: bug 317591
Bug Description: Admin server won't start if SELINUX is enabled
Reviewed by: nkinder, nhosoi (Thanks!)
Fix Description: Just use the fortitude hack to disable selinux for the admin server (run unconfined).
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: start-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start-ds-admin.in 5 Oct 2007 23:48:02 -0000 1.4
+++ start-ds-admin.in 10 Oct 2007 20:28:29 -0000 1.5
@@ -59,4 +59,8 @@
# source env. for admin server
[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
-$HTTPD $OMIT_DEFLATE -k start -f @configdir(a)/httpd.conf "$@"
+if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+ SELINUX_CMD="runcon -t unconfined_t --"
+fi
+
+$SELINUX_CMD $HTTPD $OMIT_DEFLATE -k start -f @configdir(a)/httpd.conf "$@"
16 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd daemon.c, 1.15, 1.16 start_tls_extop.c, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22654/ldapserver/ldap/servers/slapd
Modified Files:
daemon.c start_tls_extop.c
Log Message:
Resolves: bug 244475
Bug Description: crash at startup with new ldap sdk on 64-bit platform
Reviewed by: nkinder (Thanks!)
Fix Description: I went ahead and cleaned up or removed the incorrect ber code. We do not need to use LBER_SOCKBUF_OPT_DESC or LBER_SOCKBUF_OPT_READ_FN or LBER_SOCKBUF_OPT_WRITE_FN. I removed an unnecessary malloc/free and just used the stack as we do everywhere else in the code. It looks as though the start_tls cleanup code is almost never used - the code assumes that when you do a start_tls, that stays in force throughout the lifetime of the connection. Removing this code now should insulate us from future ldap c sdk changes.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
Index: daemon.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- daemon.c 20 Sep 2007 16:54:38 -0000 1.15
+++ daemon.c 10 Oct 2007 01:55:36 -0000 1.16
@@ -2242,13 +2242,9 @@
}
PR_Lock( conn->c_mutex );
-#if !defined( XP_WIN32 )
- ber_sockbuf_set_option(conn->c_sb,LBER_SOCKBUF_OPT_DESC,&pr_clonefd);
-#else
+#if defined( XP_WIN32 )
if( !secure )
ber_sockbuf_set_option(conn->c_sb,LBER_SOCKBUF_OPT_DESC,&ns);
- else
- ber_sockbuf_set_option(conn->c_sb,LBER_SOCKBUF_OPT_DESC,&pr_clonefd);
#endif
conn->c_sd = ns;
@@ -2288,13 +2284,6 @@
func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) pr_clonefd;
ber_sockbuf_set_option( conn->c_sb,
LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
-
- /* changed here by Cheston
- ber_sockbuf_set_option( conn->c_sb,
- LBER_SOCKBUF_OPT_READ_FN, (void *)secure_read_function );
- ber_sockbuf_set_option( conn->c_sb,
- LBER_SOCKBUF_OPT_WRITE_FN, (void *)secure_write_function );
- */
} else {
struct lber_x_ext_io_fns func_pointers;
memset(&func_pointers, 0, sizeof(func_pointers));
@@ -2309,12 +2298,6 @@
#endif
ber_sockbuf_set_option( conn->c_sb,
LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
- /*
- ber_sockbuf_set_option( conn->c_sb,
- LBER_SOCKBUF_OPT_READ_FN, (void *)read_function );
- ber_sockbuf_set_option( conn->c_sb,
- LBER_SOCKBUF_OPT_WRITE_FN, (void *)write_function );
- */
}
if( secure && config_get_SSLclientAuth() != SLAPD_SSLCLIENTAUTH_OFF ) {
Index: start_tls_extop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/start_tls_extop.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- start_tls_extop.c 27 Feb 2007 02:57:30 -0000 1.9
+++ start_tls_extop.c 10 Oct 2007 01:55:36 -0000 1.10
@@ -277,24 +277,17 @@
secure = 1;
ns = configure_pr_socket( &newsocket, secure, 0 /*never local*/ );
-
- /*
- ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_DESC, &newsocket );
- ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_READ_FN, (void *)secure_read_function );
- ber_sockbuf_set_option( conn->c_sb, LBER_SOCKBUF_OPT_WRITE_FN, (void *)secure_write_function );
- */
-
/*changed to */
{
- struct lber_x_ext_io_fns *func_pointers = malloc(LBER_X_EXTIO_FNS_SIZE);
- func_pointers->lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
- func_pointers->lbextiofn_read = secure_read_function;
- func_pointers->lbextiofn_write = secure_write_function;
- func_pointers->lbextiofn_writev = NULL;
- func_pointers->lbextiofn_socket_arg = (struct lextiof_socket_private *) newsocket;
+ struct lber_x_ext_io_fns func_pointers;
+ memset(&func_pointers, 0, sizeof(func_pointers));
+ func_pointers.lbextiofn_size = LBER_X_EXTIO_FNS_SIZE;
+ func_pointers.lbextiofn_read = secure_read_function;
+ func_pointers.lbextiofn_write = secure_write_function;
+ func_pointers.lbextiofn_writev = NULL;
+ func_pointers.lbextiofn_socket_arg = (struct lextiof_socket_private *) newsocket;
ber_sockbuf_set_option( conn->c_sb,
- LBER_SOCKBUF_OPT_EXT_IO_FNS, func_pointers);
- free(func_pointers);
+ LBER_SOCKBUF_OPT_EXT_IO_FNS, &func_pointers);
}
conn->c_flags |= CONN_FLAG_SSL;
conn->c_flags |= CONN_FLAG_START_TLS;
@@ -420,26 +413,17 @@
secure = 0;
ns = configure_pr_socket( &(c->c_prfd), secure, 0 /*never local*/ );
- ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_DESC, &(c->c_prfd) );
-
#else
ns = PR_FileDesc2NativeHandle( c->c_prfd );
c->c_prfd = NULL;
configure_ns_socket( &ns );
-
- ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_DESC, &ns );
-
#endif
c->c_sd = ns;
c->c_flags &= ~CONN_FLAG_SSL;
c->c_flags &= ~CONN_FLAG_START_TLS;
- ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_READ_FN, (void *)read_function );
- ber_sockbuf_set_option( c->c_sb, LBER_SOCKBUF_OPT_WRITE_FN, (void *)write_function );
-
-
/* authentication & authorization credentials must be set to "anonymous". */
bind_credentials_clear( c, PR_FALSE, PR_TRUE );
16 years, 6 months
[Fedora-directory-commits] esc/src/app/xpcom/tray rhTray.cpp, 1.6, 1.7
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27477
Modified Files:
rhTray.cpp
Log Message:
Fix for Vista tray icon issue. #239755.
Index: rhTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rhTray.cpp 24 Feb 2007 02:05:13 -0000 1.6
+++ rhTray.cpp 9 Oct 2007 22:18:58 -0000 1.7
@@ -192,6 +192,7 @@
/* void settooltipmsg (in string aMessage); */
NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
{
+
char tBuff[56];
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Settooltipmsg %s \n",GetTStamp(tBuff,56),aMessage));
@@ -467,7 +468,7 @@
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::WindowProc: WM_RBUTTONDOWN \n",GetTStamp(tBuff,56)));
- HRESULT res = rhTray::ShowPopupMenu (IDR_MENU1);
+ HRESULT res = rhTray::ShowPopupMenu (IDR_MENU1);
switch(res)
@@ -592,8 +593,10 @@
unsigned int menuItemID = 0;
int i = 0;
+
+ char buffer[256];
- if(numItems == numMenuItems)
+ if(numItems == numMenuItems )
{
for (i = 0 ;i < numMenuItems; i++)
{
@@ -618,15 +621,18 @@
if( GetMenuItemInfo(hPopup,menuItemID,FALSE,&mii))
{
- char *tmpBuff = NULL;
-
- tmpBuff = strdup(itemText);
+ buffer[0] = 0;
- mii.cch=strlen(itemText);
- mii.dwTypeData=tmpBuff;
+ if(strlen(itemText) < 256)
+ {
+ strcpy(buffer,itemText);
+ }
+
+ mii.cch=strlen(buffer);
+ mii.fType = MFT_STRING;
+ mii.dwTypeData= buffer;
SetMenuItemInfo(hPopup,menuItemID,FALSE,&mii);
- free(tmpBuff);
}
else
{
16 years, 6 months