[Fedora-directory-commits] ldapserver component_versions.mk, 1.35.2.11, 1.35.2.12 internal_comp_deps.mk, 1.24.2.4, 1.24.2.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10101
Modified Files:
Tag: Directory71RtmBranch
component_versions.mk internal_comp_deps.mk
Log Message:
Picking up the rebuilt libdb4.2 (20080121)
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/Attic/component_versions.mk,v
retrieving revision 1.35.2.11
retrieving revision 1.35.2.12
diff -u -r1.35.2.11 -r1.35.2.12
--- component_versions.mk 15 Jan 2008 21:19:19 -0000 1.35.2.11
+++ component_versions.mk 22 Jan 2008 00:20:18 -0000 1.35.2.12
@@ -66,7 +66,7 @@
DB_MAJOR_MINOR:=db42
endif
ifndef DB_VERSION
- DB_VERSION:=20040813
+ DB_VERSION:=20080121
endif
# DBM Library
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/Attic/internal_comp_deps.mk,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -r1.24.2.4 -r1.24.2.5
--- internal_comp_deps.mk 15 Jan 2008 21:19:19 -0000 1.24.2.4
+++ internal_comp_deps.mk 22 Jan 2008 00:20:18 -0000 1.24.2.5
@@ -297,10 +297,11 @@
ifndef DB_SOURCE_ROOT
#if no version specified, we'll use the latest one
ifndef DB_VERSION
- DB_VERSION=20040130
+ DB_VERSION=20080121
endif
# define the paths to the component parts
-db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
+#db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
+db_components_share=$(COMPONENTS_DIR_DEV)/$(db_component_name)
MY_NSOBJDIR_TAG=$(NSOBJDIR_TAG).OBJ
db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(NS64TAG)$(MY_NSOBJDIR_TAG)
# add ",bin" to DB_FILES if you want the programs like db_verify, db_recover, etc.
16 years, 3 months
[Fedora-directory-commits] esc/src/app/xpcom/tray rhLinuxTray.cpp, 1.5, 1.6
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29234
Modified Files:
rhLinuxTray.cpp
Log Message:
Fix for tray icon popup menu positioning. Bug#253248.
Index: rhLinuxTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhLinuxTray.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rhLinuxTray.cpp 7 May 2007 23:46:43 -0000 1.5
+++ rhLinuxTray.cpp 18 Jan 2008 17:53:57 -0000 1.6
@@ -49,9 +49,15 @@
char tBuff[56];
GtkWidget *icon_box_widget = GTK_WIDGET(user_data);
+
if(icon_box_widget)
{
+ GdkScreen* gscreen = gdk_screen_get_default();
GdkWindow* window = icon_box_widget->window;
+
+ if(!window)
+ return;
+
gint width;
gint height;
@@ -59,20 +65,37 @@
gint px;
gint py;
+ gint screen_width = 0;
+ gint screen_height = 0;
+
+ if(gscreen)
+ {
+ screen_width = gdk_screen_get_width(gscreen);
+ screen_height = gdk_screen_get_height(gscreen);
+ }
+
gdk_drawable_get_size(window,&width,&height);
- gdk_window_get_position(window,
+ gdk_window_get_origin(window,
&px,
&py);
- PR_LOG( trayLog, PR_LOG_DEBUG, ("%s popup_position width %d height %d px %d py %d \n",GetTStamp(tBuff,56),width,height,px,py));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s popup_position width %d height %d px %d py %d *x %d *y %d screen_w %d screen_h %d \n",GetTStamp(tBuff,56),width,height,px,py,*x,*y,screen_width, screen_height));
+
+ // Are we close to the bottom of the screen?
+ if( screen_width > 0 && screen_height > 0
+ && ( screen_height - py) < (height * 3))
+ {
+ height = height* -2 ;
+ }
gint x_coord = px;
gint y_coord = (py + height);
*x = x_coord;
*y = y_coord;
+ *push_in = TRUE;
}
16 years, 3 months
[Fedora-directory-commits] esc/src/app/xpcom rhCoolKey.cpp,1.8,1.9
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29158
Modified Files:
rhCoolKey.cpp
Log Message:
Minor diagnostics log fix. Bug#253268.
Index: rhCoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/rhCoolKey.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rhCoolKey.cpp 7 Jun 2007 21:16:28 -0000 1.8
+++ rhCoolKey.cpp 18 Jan 2008 17:52:52 -0000 1.9
@@ -817,7 +817,7 @@
NS_IMETHODIMP rhCoolKey::ResetCoolKeyPIN(PRUint32 aKeyType, const char *aKeyID, const char *aScreenName, const char *aPIN, const char *aScreenNamePwd)
{
char tBuff[56];
- ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Reset Key PIN, ID: %s \n",GetTStamp(tBuff,56),aKeyID);
+ ::CoolKeyLogMsg( PR_LOG_ALWAYS, "%s Attempting to Reset Key Password, ID: %s \n",GetTStamp(tBuff,56),aKeyID);
CoolKeyNode *node = GetCoolKeyInfo(aKeyType, aKeyID);
if (!node)
16 years, 3 months
[Fedora-directory-commits] ldapserver nsconfig.mk,1.14,1.14.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6329
Modified Files:
Tag: Directory71RtmBranch
nsconfig.mk
Log Message:
Fixing the solaris build problem:
relocation error: R_SPARC_H44: file ./lib/libadmin/authdb.o: symbol <unknown>:
relocations based on the ABS44 coding model can not be used in building a
shared object
> Building shared libraries for SPARCV9
> By default, the SPARC compiler assumes that SPARCV9 objects are built with
> -xcode=abs44, which means that 44 bits are used to hold the absolute address
> of any object. Shared libraries should be built using position independent
> code, either -xcode=pic13 or -xcode=pic32
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/Attic/nsconfig.mk,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- nsconfig.mk 10 May 2005 23:16:59 -0000 1.14
+++ nsconfig.mk 17 Jan 2008 00:48:06 -0000 1.14.2.1
@@ -1105,6 +1105,7 @@
ARCH_CFLAGS += -m64
endif
endif
+ARCH_CFLAGS += -xcode=pic32
ARCH_DEBUG=-g
RANLIB=true
16 years, 3 months
[Fedora-directory-commits] dsgw/tests/lang testget.1, NONE, 1.1 testget.10, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 testget.4, NONE, 1.1 testget.5, NONE, 1.1 testget.6, NONE, 1.1 testget.7, NONE, 1.1 testget.8, NONE, 1.1 testget.9, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw/tests/lang
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23442/dsgw/tests/lang
Added Files:
testget.1 testget.10 testget.2 testget.3 testget.4 testget.5
testget.6 testget.7 testget.8 testget.9
Log Message:
added manuals; fixed code that displays manuals; added initial tests
--- NEW FILE testget.1 ---
--- NEW FILE testget.10 ---
info=../../../../
--- NEW FILE testget.2 ---
info=
--- NEW FILE testget.3 ---
file=
--- NEW FILE testget.4 ---
info=&file=
--- NEW FILE testget.5 ---
file=/
--- NEW FILE testget.6 ---
file=.
--- NEW FILE testget.7 ---
file=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
--- NEW FILE testget.8 ---
file=../aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
--- NEW FILE testget.9 ---
file=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/..
16 years, 3 months
[Fedora-directory-commits] dsgw/tests setup.sh,NONE,1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23442/dsgw/tests
Added Files:
setup.sh
Log Message:
added manuals; fixed code that displays manuals; added initial tests
--- NEW FILE setup.sh ---
#!/bin/sh
testdir="$1"
sroot=/home/$USER/11srv
port=1100
secport=1101
rootdn="cn=directory manager"
rootpw=password
adminpw=admin
#needinstance=1
#needdata=1
usessl=1
PATH=/usr/lib64/mozldap:/usr/lib/mozldap:$PATH
export PATH
suffix="dc=example,dc=com"
hostname=vmhost
inst=slapd-$hostname
if [ "$needinstance" ] ; then
$sroot/sbin/setup-ds.pl - <<EOF
[General]
FullMachineName= localhost.localdomain
SuiteSpotUserID= $USER
ServerRoot= $sroot/lib/dirsrv
[slapd]
ServerPort= $port
ServerIdentifier= localhost
Suffix= o=NetscapeRoot
RootDN= $rootdn
RootDNPwd= $rootpw
EOF
fi
if [ "$needdata" ] ; then
$sroot/lib/dirsrv/slapd-localhost/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i $testdir/nsroot.ldif
sleep 10
fi
rm -rf testtmp
mkdir testtmp
if [ "$usessl" ] ; then
ldapurl="ldaps://$hostname:$secport/$suffix"
# grab CA cert
certutil -L -d $sroot/etc/dirsrv/$inst -n "CA certificate" -a > testtmp/cacert.asc
# pin file
echo "passwordpassword" > testtmp/pwdfile.txt
# create sec db
certutil -N -d testtmp -f testtmp/pwdfile.txt
# import CA cert
certutil -A -d testtmp -n "CA certificate" -t "CT,," -a -i testtmp/cacert.asc
port=$secport
else
ldapurl="ldap://localhost:$port/$suffix"
hostname=localhost
fi
DSGW_CONTEXT_DIR=`pwd`/testtmp ; export DSGW_CONTEXT_DIR
sed -e "s#@host@#$hostname#g" \
-e "s#@port@#$port#g" \
-e "s#@suffix@#$suffix#g" \
-e "s#@dirmgr@#cn=directory manager#g" \
-e "s#@contextdir@#$DSGW_CONTEXT_DIR#g" \
-e "s#@htmldir@#$sroot/share/dirsrv/dsgw/html#g" \
-e "s#@configdir@#$sroot/share/dirsrv/dsgw/config#g" \
config/dsgw.tmpl > testtmp/dsgw.conf
sed -e "s#@host@#$hostname#g" \
-e "s#@port@#$port#g" \
-e "s#@suffix@#$suffix#g" \
-e "s#@dirmgr@#cn=directory manager#g" \
-e "s#@contextdir@#$DSGW_CONTEXT_DIR#g" \
-e "s#@pbhtmldir@#$sroot/share/dirsrv/dsgw/pbhtml#g" \
-e "s#@pbconfigdir@#$sroot/share/dirsrv/dsgw/pbconfig#g" \
pbconfig/pb.tmpl > testtmp/pb.conf
dir=`pwd`
# CGI env. vars
#ADMSERV_CONF_DIR=$dir/testtmp
#ADMSERV_CONF_DIR=$sroot/etc/fedora-ds/admin-serv
#export ADMSERV_CONF_DIR
#ADMSERV_LOG_DIR=$dir/testtmp
#export ADMSERV_LOG_DIR
HTTP_ACCEPT_LANGUAGE=en
export HTTP_ACCEPT_LANGUAGE
SERVER_URL=http://localhost
export SERVER_URL
pwpfile=/tmp/pwp.$$
cat > $pwpfile <<EOF
User: admin
Password: $adminpw
UserDN: uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot
SIEPWD: $adminpw
EOF
VGPREFIX="valgrind --tool=memcheck --leak-check=yes --suppressions=$HOME/valgrind.supp --num-callers=40 "
GDB="gdb -x .gdbinit "
DEBUGCMD=VALGRIND
#DEBUGCMD="$GDB"
PROGS="lang"
# use scripts for orgchart perl scripts
SCRIPTS=""
runATest() {
prog="$1"
shift
type="$1"
shift
mytest="$1" # this is the test filename, not the test name
shift
varnum="$1" # which variant
shift
variant="$1"
set -x
if [ ! -d results/$prog ] ; then mkdir -p results/$prog ; fi
basetest=`basename $mytest`$varnum
echo "Running test $mytest$varnum . . ."
if [ -n "$varnum" ] ; then
testtmpfile=/tmp/$prog.$basetest
cp $mytest $testtmpfile
echo -n "$variant" >> $testtmpfile
mytest=$testtmpfile
else
testtmpfile=
fi
REQUEST_METHOD=$type ; export REQUEST_METHOD
if [ $type = "GET" ] ; then
QUERY_STRING="`cat $mytest`" ; export QUERY_STRING
else
CONTENT_LENGTH=`wc -c $mytest | cut -f1 -d' '` ; export CONTENT_LENGTH
fi
SCRIPT_NAME=/clients/dsgw/bin/$prog ; export SCRIPT_NAME
exec 4<$pwpfile
PASSWORD_PIPE=4 ; export PASSWORD_PIPE
if [ -n "$DEBUGCMD" -a "$DEBUGCMD" = "$GDB" ] ; then
echo "break main" > .gdbinit
if [ $type = "POST" ] ; then
echo "run < $mytest > results/$prog/$basetest.html" >> .gdbinit
else
echo "run > results/$prog/$basetest.html" >> .gdbinit
fi
./libtool --mode execute $GDB ./$prog
elif [ "$DEBUGCMD" = "VALGRIND" ] ; then
VALGRIND="$VGPREFIX --log-file-exactly=results/$prog/$basetest.vg"
if [ $type = "POST" ] ; then
./libtool --mode execute $VALGRIND ./$prog < $mytest > results/$prog/$basetest.html
else
./libtool --mode execute $VALGRIND ./$prog > results/$prog/$basetest.html
fi
else
if [ $type = "POST" ] ; then
./libtool --mode execute ./$prog < $mytest > results/$prog/$basetest.html
else
./libtool --mode execute ./$prog > results/$prog/$basetest.html
fi
fi
4<&- # close the pwpfile
if [ -n "$testtmpfile" -a -f "$testtmpfile" ] ; then
rm -f "$testtmpfile"
fi
set +x
}
runGetTestsForProg() {
prog="$1" # test must be in dir of same name
shift
getlist=/tmp/gettests.$$
find $testdir/$prog -name testget.\* -print 2> /dev/null | sort -n > $getlist
for test in `cat $getlist` ; do
runATest "$prog" GET "$test"
ctxnum=1
for ctx in "" "/" "." "../../../" "somebogusvalue" "pb" "dsgw" ; do
if [ -s "$test" ] ; then
runATest "$prog" GET "$test" .$ctxnum "&context=$ctx"
else
runATest "$prog" GET "$test" .$ctxnum "context=$ctx"
fi
ctxnum=`expr $ctxnum + 1`
done
done
rm -f $getlist
}
runPostTestsForProg() {
prog="$1" # test must be in dir of same name
shift
postlist=/tmp/posttests.$$
find $testdir/$prog -name testpost.\* -print 2> /dev/null | sort -n > $postlist
for test in `cat $postlist` ; do
runATest "$prog" POST "$test"
ctxnum=1
for ctx in "" "/" "." "../../../" "somebogusvalue" "pb" "dsgw" ; do
runATest "$prog" POST "$test" .$ctxnum "&context=$ctx"
ctxnum=`expr $ctxnum + 1`
done
done
rm -f $postlist
}
# each prog has a subdir containing the GET/POST args and any other test data
for prog in $PROGS ; do
runGetTestsForProg "$prog"
runPostTestsForProg "$prog"
done
for prog in $SCRIPTS ; do
getlist=/tmp/gettests.$$
find $testdir/$prog -name testget.\* -print 2> /dev/null | sort -n > $getlist
for test in `cat $getlist` ; do
if [ ! -d results/$prog ] ; then mkdir -p results/$prog ; fi
basetest=`basename $test`
echo "Running test $test"
REQUEST_METHOD=GET ; export REQUEST_METHOD
QUERY_STRING="`cat $test`" ; export QUERY_STRING
SCRIPT_NAME=slapd/Tasks/Operation/$prog ; export SCRIPT_NAME
# open pwpfile for reading as file desc 4 - CGIs have to use stdin (0) for POST
exec 4<$pwpfile
PASSWORD_PIPE=4 ; export PASSWORD_PIPE
if [ -n "$DEBUGCMD" -a "$DEBUGCMD" = "$GDB" ] ; then
perl -d orgchart/$prog
else
perl -w orgchart/$prog
fi
done
rm -f $getlist
done
rm -rf $pwpfile .gdbinit
16 years, 3 months