[prev in list] [next in list] [prev in thread] [next in thread]
List: fedora-directory-commits
Subject: [389-commits] 8 commits - cgiutil.c configure configure.ac doauth.c emitf.c entrydisplay.c .gitignor
From: Richard Allen Megginson <rmeggins () fedoraproject ! org>
Date: 2013-08-20 20:49:32
Message-ID: 20130820204932.7BE7E60D46 () fedorahosted ! org
[Download RAW message or body]
.gitignore | 4 ++++
cgiutil.c | 2 +-
configure | 24 ++++++++++--------------
configure.ac | 2 +-
doauth.c | 8 ++------
emitf.c | 4 +++-
entrydisplay.c | 3 +++
htmlout.c | 3 +--
htmlparse.c | 2 --
m4/adminutil.m4 | 4 ----
newentry.c | 2 --
sort.c | 6 +++++-
tests/lang/testget.15 | 1 +
tests/lang/testget.16 | 1 +
tests/lang/testpost.13 | 1 +
tests/lang/testpost.14 | 1 +
tests/setup.sh | 28 ++++++++++++++--------------
tmplout.c | 7 ++-----
unauth.c | 6 ++----
19 files changed, 52 insertions(+), 57 deletions(-)
New commits:
commit 4b5381bb098c667699712a37b259e2e436adf55c
Author: Rich Megginson <rmeggins@redhat.com>
Date: Tue Aug 20 14:08:15 2013 -0600
bump version to 1.1.11
diff --git a/configure b/configure
index 7f48df6..b05fa1b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dirsrv-gw 1.1.9.
+# Generated by GNU Autoconf 2.69 for dirsrv-gw 1.1.11.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dirsrv-gw'
PACKAGE_TARNAME='dirsrv-gw'
-PACKAGE_VERSION='1.1.9'
-PACKAGE_STRING='dirsrv-gw 1.1.9'
+PACKAGE_VERSION='1.1.11'
+PACKAGE_STRING='dirsrv-gw 1.1.11'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
PACKAGE_URL=''
@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then
# 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 dirsrv-gw 1.1.9 to adapt to many kinds of systems.
+\`configure' configures dirsrv-gw 1.1.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1488,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv-gw 1.1.9:";;
+ short | recursive ) echo "Configuration of dirsrv-gw 1.1.11:";;
esac
cat <<\_ACEOF
@@ -1632,7 +1632,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv-gw configure 1.1.9
+dirsrv-gw configure 1.1.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2176,7 +2176,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv-gw $as_me 1.1.9, which was
+It was created by dirsrv-gw $as_me 1.1.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3001,7 +3001,7 @@ fi
# Define the identity of the package.
PACKAGE='dirsrv-gw'
- VERSION='1.1.9'
+ VERSION='1.1.11'
cat >>confdefs.h <<_ACEOF
@@ -18741,7 +18741,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dirsrv-gw $as_me 1.1.9, which was
+This file was extended by dirsrv-gw $as_me 1.1.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18807,7 +18807,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dirsrv-gw config.status 1.1.9
+dirsrv-gw config.status 1.1.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c3bfc50..04be099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dirsrv-gw], [1.1.9], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-gw], [1.1.11], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([dsgwutil.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
commit 9bebf4c8bf5f069ef58362955d1ac5fc92efde96
Author: Rich Megginson <rmeggins@redhat.com>
Date: Mon Aug 19 15:35:30 2013 -0600
added charset tests - modularized test script - improved valgrind checking
diff --git a/tests/lang/testget.15 b/tests/lang/testget.15
new file mode 100644
index 0000000..48d88cf
--- /dev/null
+++ b/tests/lang/testget.15
@@ -0,0 +1 @@
+file=.MANUAL/contents.html&charset=ISO_8859-1
\ No newline at end of file
diff --git a/tests/lang/testget.16 b/tests/lang/testget.16
new file mode 100644
index 0000000..eaa0891
--- /dev/null
+++ b/tests/lang/testget.16
@@ -0,0 +1 @@
+file=.MANUAL/contents.html&charset=ISO_8859-999999999999999999999
\ No newline at end of file
diff --git a/tests/lang/testpost.13 b/tests/lang/testpost.13
new file mode 100644
index 0000000..48d88cf
--- /dev/null
+++ b/tests/lang/testpost.13
@@ -0,0 +1 @@
+file=.MANUAL/contents.html&charset=ISO_8859-1
\ No newline at end of file
diff --git a/tests/lang/testpost.14 b/tests/lang/testpost.14
new file mode 100644
index 0000000..8026739
--- /dev/null
+++ b/tests/lang/testpost.14
@@ -0,0 +1 @@
+file=.MANUAL/contents.html&charset=ISO_8859-999999999999
\ No newline at end of file
diff --git a/tests/setup.sh b/tests/setup.sh
index 66b5668..d1d47ac 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -1,20 +1,20 @@
#!/bin/sh
testdir="$1"
-hostname=vmhost.testdomain.com
+hostname=${HOSTNAME:-vmhost.testdomain.com}
sroot=${SROOT:-/home/$USER/dsol}
-secdir=/home/$USER/save
-port=1300
+secdir=${SECDIR:-/home/$USER/save}
+port=${PORT:-1300}
secport=`expr $port + 1`
-rootdn="cn=directory manager"
-rootpw=password
+rootdn=${ROOTDN:-"cn=directory manager"}
+rootpw=${ROOTPW:-password}
adminpw=admin
-needdata=1
-usessl=1
+needdata=${NEEDDATA:-1}
+usessl=${USESSL:-1}
suffix="dc=example,dc=com"
-instance=ds
+instance=${INST:-ds}
inst=slapd-$instance
-resetdata=1
+resetdata=${RESETDATA:-1}
if [ ! -d $sroot/etc/dirsrv/$inst ] ; then
$sroot/sbin/setup-ds.pl -s -f - <<EOF
@@ -76,7 +76,7 @@ $sroot/lib/dirsrv/slapd-$instance/start-slapd
fi
-if [ "$needdata" ] ; then
+if [ "$needdata" -eq 1 ] ; then
$sroot/lib/dirsrv/$inst/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i \
$sroot/share/dirsrv/data/Example.ldif sleep 10
fi
@@ -84,7 +84,7 @@ fi
rm -rf testtmp
mkdir testtmp
-if [ "$usessl" ] ; then
+if [ "$usessl" -eq 1 ] ; then
ldapurl="ldaps://$hostname:$secport"
# grab CA cert
certutil -L -d $sroot/etc/dirsrv/$inst -n "CA certificate" -a > \
testtmp/cacert.asc @@ -147,7 +147,7 @@ EOF
#VGPREFIX="valgrind --tool=memcheck --leak-check=yes \
--suppressions=$HOME/valgrind.supp --num-callers=40 \
--suppressions=$testdir/valgrind.supp " # These are CGI programs - they assume they \
will run for a very short period of time - they use exit() instead of \
free() :P
-VGPREFIX="valgrind -q --tool=memcheck --leak-check=no \
--suppressions=$HOME/valgrind.supp --num-callers=40 \
--suppressions=$testdir/valgrind.supp " +VGPREFIX="valgrind -q --trace-children=yes \
--tool=memcheck --track-origins=yes --read-var-info=yes --leak-check=no \
--suppressions=$HOME/valgrind.supp --num-callers=50 \
--suppressions=$testdir/valgrind.supp " GDB="gdb -x .gdbinit "
#DEBUGCMD=VALGRIND
#DEBUGCMD="$GDB"
@@ -274,12 +274,12 @@ runPostTestsForProg() {
# each prog has a subdir containing the GET/POST args and any other test data
for prog in $PROGS ; do
- if [ -n "$resetdata" ] ; then
+ if [ "$resetdata" -eq 1 ] ; then
$sroot/lib/dirsrv/$inst/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i \
$sroot/share/dirsrv/data/Example.ldif sleep 10
fi
runGetTestsForProg "$prog"
- if [ -n "$resetdata" ] ; then
+ if [ "$resetdata" -eq 1 ] ; then
$sroot/lib/dirsrv/$inst/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i \
$sroot/share/dirsrv/data/Example.ldif sleep 10
fi
commit a9a3a64b09ded1120bccfaefda6653b4ebe49c3b
Author: Rich Megginson <rmeggins@redhat.com>
Date: Mon Aug 19 15:32:32 2013 -0600
Ticket #47403 DSGW authentication issue
https://fedorahosted.org/389/ticket/47403
Reviewed by: nkinder (Thanks!)
Branch: master
Fix Description: The charset conversion was not working, which caused the
message about the charset is not supported. The size of the conversion
buffer was negative, and this caused the conversion to utf8 to fail. This
caused, among other things, the problem with the authentication credentials.
Platforms tested: RHEL6 x86_64, Fedora 20
Flag Day: no
Doc impact: no
diff --git a/cgiutil.c b/cgiutil.c
index e65cc96..7fcf8e7 100644
--- a/cgiutil.c
+++ b/cgiutil.c
@@ -86,7 +86,7 @@ dsgw_vec_convert (char** vec)
/* copy the converted characters into t after the '=', and
leave room for the trailing 0 */
result = dsgw_convert(DSGW_TO_UTF8, converter,
- &tptr, (tlen - nlen - 1), &reallen,
+ &tptr, (tlen - 1), &reallen,
s, slen, &realSlen, &err);
tlen += slen; /* if failed, make more room */
} while (result == 0);
commit 2bf6b8e06b77280eb0e7a83f4701316e75615388
Author: Rich Megginson <rmeggins@redhat.com>
Date: Mon Aug 19 09:40:55 2013 -0600
Ticket #47328 389-dsgw: entrydisplay.c:2523: bad switch statement
https://fedorahosted.org/389/ticket/47328
Reviewed by: rmeggins
Branch: master
Fix Description: Add break statements
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
diff --git a/entrydisplay.c b/entrydisplay.c
index e94427e..62639b3 100644
--- a/entrydisplay.c
+++ b/entrydisplay.c
@@ -2527,6 +2527,7 @@ do_searchdesc( dsgwtmplinfo *tip, int argc, char** argv)
: ((tip->dsti_options & DSGW_DISPLAY_OPT_CUSTOM_SEARCHDESC)
? DBT_Found0Entries_
: DBT_Found0EntriesWhere_);
+ break;
case 1:
fmt = opt & 1
? ((tip->dsti_options & DSGW_DISPLAY_OPT_CUSTOM_SEARCHDESC)
@@ -2535,6 +2536,7 @@ do_searchdesc( dsgwtmplinfo *tip, int argc, char** argv)
: ((tip->dsti_options & DSGW_DISPLAY_OPT_CUSTOM_SEARCHDESC)
? DBT_Found1Entry_
: DBT_Found1EntryWhere_);
+ break;
default:
fmt = opt & 1
? ((tip->dsti_options & DSGW_DISPLAY_OPT_CUSTOM_SEARCHDESC)
@@ -2543,6 +2545,7 @@ do_searchdesc( dsgwtmplinfo *tip, int argc, char** argv)
: ((tip->dsti_options & DSGW_DISPLAY_OPT_CUSTOM_SEARCHDESC)
? DBT_FoundEntries_
: DBT_FoundEntriesWhere_);
+ break;
}
{
auto char* format = XP_GetClientStr (fmt);
commit 31b6a78a1b84ca8b644bb7af36c449cdcaf61fba
Author: Rich Megginson <rmeggins@redhat.com>
Date: Mon Aug 19 09:40:46 2013 -0600
add patch files
diff --git a/.gitignore b/.gitignore
index e497513..0dee061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ autom4te.cache
.autotools
.cproject
.project
+*.patch
commit d7451d4eebff3491cafe2fb9b558c95ffb716b1b
Author: Rich Megginson <rmeggins@redhat.com>
Date: Thu Aug 15 15:41:51 2013 -0600
Ticket #47486 compiler warnings in adminutil, admin, dsgw
fix compiler warnings
Reviewed by: nhosoi (Thanks!)
Platforms tested: RHEL 6, Fedora 20
diff --git a/doauth.c b/doauth.c
index 5fe0472..18fbb4a 100644
--- a/doauth.c
+++ b/doauth.c
@@ -27,13 +27,9 @@ static void do_autherror( int rc, char *msg, char *lderrtxt,
int ommitclosebutton );
-int main( argc, argv, env )
- int argc;
- char *argv[];
+int main( int argc, char *argv[] )
{
- int reqmethod;
-
- reqmethod = dsgw_init( argc, argv, DSGW_METHOD_POST );
+ (void)dsgw_init( argc, argv, DSGW_METHOD_POST );
post_request();
diff --git a/emitf.c b/emitf.c
index b20e5f9..dc9a39d 100644
--- a/emitf.c
+++ b/emitf.c
@@ -309,7 +309,9 @@ dsgw_vxprintf (dsgw_producer produce, void* parm,
}
}
if (aslot == islot) { /* No slot refers to this arg. */
- if (va_arg (argl, const char*)); /* Skip over it. */
+ if (va_arg (argl, const char*)) {
+ ; /* Skip over it. */
+ }
} else {
/*fprintf (stderr, " %i:%i", (int)(aslot-slot), aslot->type);*/
switch (aslot->type) {
diff --git a/htmlout.c b/htmlout.c
index f49b34a..7be0e10 100644
--- a/htmlout.c
+++ b/htmlout.c
@@ -460,7 +460,7 @@ dsgw_emit_confirm_script()
{
char *yes_key_str = dsgw_get_cgi_var("YES", DSGW_CGIVAR_OPTIONAL);
/* char *no_key_str = dsgw_get_cgi_var("NO", DSGW_CGIVAR_OPTIONAL); unused \
apparently */
- int yes_key, no_key;
+ int yes_key;
char *yes = NULL, *no = NULL;
if (!yes_key_str) {
@@ -476,7 +476,6 @@ dsgw_emit_confirm_script()
} else if (!strcasecmp(yes_key_str, "CONFIRMVALUE5")) {
yes_key = DBT_confirmValue5;
}
- no_key = 0; /* unused apparently */
yes = XP_GetClientStr(yes_key);
diff --git a/htmlparse.c b/htmlparse.c
index 187ed2d..1326238 100644
--- a/htmlparse.c
+++ b/htmlparse.c
@@ -655,14 +655,12 @@ int *argc
)
{
char **vars = (char **) NULL;
- register int x;
int isvar;
char scratch[BIG_LINE];
char lastchar, *p;
int numvars = 0;
isvar = -1;
- x = 0;
scratch[0] = '\0';
lastchar = ' ';
diff --git a/newentry.c b/newentry.c
index 6110184..ce49170 100644
--- a/newentry.c
+++ b/newentry.c
@@ -31,7 +31,6 @@ emit_file (char* filename, dsgwnewtype* entType)
auto char line[ BIG_LINE ];
auto int argc;
auto char **argv;
- char *deleteme = NULL;
while ( dsgw_next_html_line( html, line )) {
if ( dsgw_parse_line( line, &argc, &argv, 0, dsgw_simple_cond_is_true, NULL )) {
@@ -106,7 +105,6 @@ emit_file (char* filename, dsgwnewtype* entType)
"function submitNameForm(nameForm)\n"
"{\n"
" if ( nameForm.entryname.value == '' ) {\n");
- deleteme = XP_GetClientStr (DBT_enterNameForNewEntry_);
dsgw_emit_alert ("newentryNameFrame", "width=400,height=130,resizable",
"%s", XP_GetClientStr (DBT_enterNameForNewEntry_));
diff --git a/sort.c b/sort.c
index 2bc6a50..0b995f2 100644
--- a/sort.c
+++ b/sort.c
@@ -75,7 +75,7 @@ ldap_keysort_entries(
LDAP_KEYCMP_CALLBACK *cmp,
LDAP_KEYFREE_CALLBACK *fre)
{
- size_t count, i;
+ int count, i;
keycmp_t kc = {0};
keything_t **kt;
LDAPMessage *e, *last;
@@ -129,8 +129,12 @@ ldap_keysort_entries(
LDAPMessage *tmp;
/* delete (unlink) the message from its unsorted place in the chain */
tmp = ldap_delete_result_entry(chain, kt[i-1]->kt_msg);
+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
PR_ASSERT(tmp != NULL); /* should be in the list */
PR_ASSERT(tmp == kt[i]->kt_msg); /* should return a pointer into the chain list */
+#else
+ (void)tmp; /* eliminate compiler warning */
+#endif
/* ldap_add_result_entry adds the msg/entry to the front of the list */
/* so we have to add them backwards to preserve the sorted order */
ldap_add_result_entry(chain, kt[i-1]->kt_msg);
diff --git a/tmplout.c b/tmplout.c
index a51e6a1..2a6762e 100644
--- a/tmplout.c
+++ b/tmplout.c
@@ -455,7 +455,7 @@ do_entry2text_search(
char *urlprefix
)
{
- int err, freedn, html;
+ int err, freedn;
char *buf, **fetchattrs, **vals;
LDAPMessage *ldmp;
struct ldap_disptmpl *tmpl;
@@ -470,8 +470,6 @@ do_entry2text_search(
return( err );
}
- html = ( urlprefix != NULL );
-
timeout.tv_sec = SEARCH_TIMEOUT_SECS;
timeout.tv_usec = 0;
@@ -1029,7 +1027,7 @@ searchaction( LDAP *ld, char *buf, char *base, LDAPMessage \
*entry, char *dn, char **members;
struct berval **bmembers;
struct berval **bvals;
- char *value, *filtpattern, *attr, *selectname;
+ char *value, *filtpattern, *attr;
char *retattrs[2], filter[ 256 ];
LDAPMessage *ldmp;
struct timeval timeout;
@@ -1046,7 +1044,6 @@ searchaction( LDAP *ld, char *buf, char *base, LDAPMessage \
*entry, char *dn, filtpattern = tip->ti_args[ 1 ];
retattrs[ 0 ] = tip->ti_args[ 2 ];
retattrs[ 1 ] = NULL;
- selectname = tip->ti_args[ 3 ];
bvals = NULL;
if ( attr == NULL ) {
diff --git a/unauth.c b/unauth.c
index dcfea72..525b073 100644
--- a/unauth.c
+++ b/unauth.c
@@ -30,12 +30,10 @@ void generate_message( int type );
int main( int argc, char **argv )
{
- int reqmethod;
char *expck;
char *authck;
- int rc;
- reqmethod = dsgw_init( argc, argv, DSGW_METHOD_GET );
+ (void)dsgw_init( argc, argv, DSGW_METHOD_GET );
authck = dsgw_get_auth_cookie();
if ( authck == NULL ) {
@@ -46,7 +44,7 @@ int main( int argc, char **argv )
}
/* Remove the cookie from the cookie database */
- rc = dsgw_delcookie( authck );
+ (void)dsgw_delcookie( authck );
/* Generate a cookie header with the cookie set to [unauthenticated] */
expck = dsgw_ch_malloc( strlen( DSGW_CKHDR ) + strlen( DSGW_AUTHCKNAME ) +
commit 80745b963d0b8ce06f223204b076ef26f97fcc64
Author: Rich Megginson <rmeggins@redhat.com>
Date: Thu Aug 15 15:41:04 2013 -0600
Ticket #47465 problem with 389-adminutil detection in m4/adminutil.m4 in \
389-admin and 389-dsgw
https://fedorahosted.org/389/ticket/47465
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description: Do not need to check for defined adminutil_lib and
adminutil_inc - pkg-config will fail if they cannot be determined.
Platforms tested: RHEL6 x86_64, Fedora 20
Flag Day: no
Doc impact: no
diff --git a/configure b/configure
index eae3cfb..7f48df6 100755
--- a/configure
+++ b/configure
@@ -18103,10 +18103,6 @@ fi
fi
fi
-if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
- as_fn_error $? "ADMINUTIL not found, specify with --with-adminutil." "$LINENO" 5
-fi
-
if test "$with_openldap" = "yes"; then
OPENLDAP_TRUE=
diff --git a/m4/adminutil.m4 b/m4/adminutil.m4
index 1d5900b..c5d4893 100644
--- a/m4/adminutil.m4
+++ b/m4/adminutil.m4
@@ -62,7 +62,3 @@ if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
fi
fi
fi
-
-if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
- AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.])
-fi
commit a7dfff007a768af53509f8eab4248f97eb3dfb13
Author: Rich Megginson <rmeggins@redhat.com>
Date: Thu Aug 15 15:27:05 2013 -0600
add Eclipse generated files
diff --git a/.gitignore b/.gitignore
index c0b150c..e497513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
*~
autom4te.cache
+.autotools
+.cproject
+.project
--
389 commits mailing list
389-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/389-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic