Hello community, here is the log from the commit of package dhcdbd checked in at Thu Oct 26 20:15:13 CEST 2006. -------- --- dhcdbd/dhcdbd.changes 2006-08-16 11:07:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcdbd/dhcdbd.changes 2006-10-25 12:53:36.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Oct 25 12:03:39 CEST 2006 - thoenig@suse.de + +- Update patch dhcdbd-dbus-reconnect-thoenig-03.patch: Do not crash + on D-Bus restart (b.n.c. 212468) + +------------------------------------------------------------------- +Tue Oct 24 16:33:02 CEST 2006 - rml@suse.de + +- Update to dhcdbd 1.14. We already carried the fixes as patches, + so this is just a version bump and packaging cleanup. +- Drop patch dhcdbd-1.14-bug-fixes.patch + +------------------------------------------------------------------- Old: ---- dhcdbd-1.12.tar.gz dhcdbd-1.14-bug-fixes.patch dhcdbd-dbus-reconnect-thoenig-02.patch New: ---- dhcdbd-1.14.tar.gz dhcdbd-dbus-reconnect-thoenig-03.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcdbd.spec ++++++ --- /var/tmp/diff_new_pack.SGPUdF/_old 2006-10-26 20:15:02.000000000 +0200 +++ /var/tmp/diff_new_pack.SGPUdF/_new 2006-10-26 20:15:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dhcdbd (Version 1.12) +# spec file for package dhcdbd (Version 1.14) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,21 +13,20 @@ Name: dhcdbd BuildRequires: dbus-1-devel glib2-devel Summary: DHCP D-BUS Daemon -Version: 1.12 -Release: 23 -License: GPL +Version: 1.14 +Release: 1 +License: GNU General Public License (GPL) - all versions Group: Productivity/Networking/Boot/Utilities URL: http://people.redhat.com/~jvdias/dhcdbd Source0: %{name}-%{version}.tar.gz Patch0: dhcdbd-lease-dir-rml-1.10-1.patch Patch1: dhcdbd-remove-named-user-rml.patch Patch2: dhcdbd-no-nr_open-rml.patch -Patch3: dhcdbd-dbus-reconnect-thoenig-02.patch +Patch3: dhcdbd-dbus-reconnect-thoenig-03.patch Patch4: dhcdbd-less-verbose-logging-rml.patch Patch5: dhcdbd-set-hostname.patch Patch6: dhcdbd-set-hostname-fix.patch -Patch7: dhcdbd-1.14-bug-fixes.patch -Patch8: dhcdbd-dbus-api-fix-thoenig-01.patch +Patch7: dhcdbd-dbus-api-fix-thoenig-01.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dhcp-client >= 3.0.3 dbus-1 >= 0.90 @@ -46,12 +45,11 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p0 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p0 +%patch7 -p0 %build make CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' LIBDIR=%_lib @@ -75,6 +73,13 @@ %dir /var/lib/named %changelog -n dhcdbd +* Wed Oct 25 2006 - thoenig@suse.de +- Update patch dhcdbd-dbus-reconnect-thoenig-03.patch: Do not crash + on D-Bus restart (b.n.c. 212468) +* Tue Oct 24 2006 - rml@suse.de +- Update to dhcdbd 1.14. We already carried the fixes as patches, + so this is just a version bump and packaging cleanup. +- Drop patch dhcdbd-1.14-bug-fixes.patch * Wed Aug 09 2006 - thoenig@suse.de - Add patch: dhcdbd-dbus-api-fix-thoenig-01.patch * Thu Jun 15 2006 - rml@suse.de ++++++ dhcdbd-1.12.tar.gz -> dhcdbd-1.14.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dhcdbd-1.12/CHANGES new/dhcdbd-1.14/CHANGES --- old/dhcdbd-1.12/CHANGES 2006-01-17 22:23:51.000000000 +0100 +++ new/dhcdbd-1.14/CHANGES 2006-04-20 21:43:43.000000000 +0200 @@ -1,6 +1,17 @@ dhcdbd Change Log ~~~~~~~~~~~~~~~~~ +* Thu Apr 20 2006 Jason Vas Dias <jvdias@redhat.com> - 1.14-1.FC5 +- fix bug 189529: prevent potential memory corruption on hex string +options with single-byte non-ascii values +- modify dhcp option types to be in line with latest ISC dhcp + +* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.12-1.FC5.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.12-1.FC5.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + * Tue Jan 17 2006 Jason Vas Dias <jvdias@redhat.com> 1.12-1 - Cleanup un-exercised code in dbus_service.c, lines 381 & 391 (pointed out by David Binderman<dcb314@hotmail.com>) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dhcdbd-1.12/RedHat/dhcdbd.spec new/dhcdbd-1.14/RedHat/dhcdbd.spec --- old/dhcdbd-1.12/RedHat/dhcdbd.spec 2006-01-17 22:23:51.000000000 +0100 +++ new/dhcdbd-1.14/RedHat/dhcdbd.spec 2006-04-20 21:43:29.000000000 +0200 @@ -1,6 +1,7 @@ # DHCP D-BUS Daemon # %{?!DHCDBD_SETUID:%define DHCDBD_SETUID 0} +%{?!NODEBUGINFO:%define NODEBUGINFO 0} # # If dhcdbd is to be run by the dbus-daemon's service activation service, # then currently it MUST be installed setuid; else, it must have an @@ -8,8 +9,8 @@ # Summary: DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options. Name: dhcdbd -Version: 1.12 -Release: 1.FC5 +Version: 1.14 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz @@ -33,13 +34,21 @@ cp -fp %{_builddir}/%{name}.spec RedHat/; fi; +%if %{NODEBUGINFO} +%define debug_package %{nil} +%endif + %build %ifarch s390x x86_64 ppc64 # every 64-bit arch EXCEPT ia64 has dbus arch. dep. includes in # /usr/lib64/dbus-1.0/include export LIBDIR=lib64 %endif -CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' make +%if %{NODEBUGINFO} +CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/'`' -Wall' CC='gcc' make +%else +CFLAGS="$RPM_OPT_FLAGS -Wall" CC='gcc' make +%endif %install DESTDIR=$RPM_BUILD_ROOT make install @@ -47,6 +56,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcdbd %endif +%if %{NODEBUGINFO} +/usr/lib/rpm/brp-compress +exit 0 +%endif %post if [ $1 -eq 1 ]; then @@ -79,6 +92,17 @@ %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h %changelog +* Thu Apr 20 2006 Jason Vas Dias <jvdias@redhat.com> - 1.14-1.FC5 +- fix bug 189529: prevent potential memory corruption on hex string + options with single-byte non-ascii values +- modify dhcp option types to be in line with latest ISC dhcp + +* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.12-1.FC5.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.12-1.FC5.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + * Tue Jan 17 2006 Jason Vas Dias <jvdias@redhat.com> 1.12-1 - Cleanup un-exercised code in dbus_service.c, lines 381 & 391 (pointed out by David Binderman<dcb314@hotmail.com>) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dhcdbd-1.12/dhcp_options.c new/dhcdbd-1.14/dhcp_options.c --- old/dhcdbd-1.12/dhcp_options.c 2006-01-17 22:23:51.000000000 +0100 +++ new/dhcdbd-1.14/dhcp_options.c 2006-04-20 20:39:57.000000000 +0200 @@ -1267,7 +1267,7 @@ } return octs; } - for(p = (uint8_t*)input; p < (endp-1); p++) + for(p = (uint8_t*)input; p < endp; p++) { if( (*p < 32) || (*p > 127) ) { @@ -1555,7 +1555,7 @@ if( vlen <= 0 ) return 0; for( p = *value, endp = (*value) + vlen; - p < (endp-1); + p < endp; p++ ) if( (*p < 32) || (*p > 127) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/dhcdbd-1.12/dhcp_options.h new/dhcdbd-1.14/dhcp_options.h --- old/dhcdbd-1.12/dhcp_options.h 2006-01-17 22:23:51.000000000 +0100 +++ new/dhcdbd-1.14/dhcp_options.h 2006-04-20 21:27:24.000000000 +0200 @@ -449,7 +449,7 @@ { "lpr-servers", "IA", DHC_O_Universe, 9, 0 }, { "impress-servers", "IA", DHC_O_Universe, 10, 0 }, { "resource-location-servers", "IA", DHC_O_Universe, 11, 0 }, - { "host-name", "X", DHC_O_Universe, 12, 0 }, + { "host-name", "t", DHC_O_Universe, 12, 0 }, { "boot-size", "S", DHC_O_Universe, 13, 0 }, { "merit-dump", "t", DHC_O_Universe, 14, 0 }, { "domain-name", "t", DHC_O_Universe, 15, 0 }, @@ -499,7 +499,7 @@ { "dhcp-rebinding-time", "L", DHC_O_Universe, 59, 0 }, { "vendor-class-identifier", "X", DHC_O_Universe, 60, 0 }, { "dhcp-client-identifier", "X", DHC_O_Universe, 61, 0 }, - { "nwip-domain", "X", DHC_O_Universe, 62, 0 }, + { "nwip-domain", "t", DHC_O_Universe, 62, 0 }, { "nwip-suboptions", "Enwip.", DHC_O_Universe, 63, 0 }, { "nisplus-domain", "t", DHC_O_Universe, 64, 0 }, { "nisplus-servers", "IA", DHC_O_Universe, 65, 0 }, @@ -523,7 +523,7 @@ { 0L, 0L, 0, 0, 0 }, { 0L, 0L, 0, 0, 0 }, { "nds-servers", "IA", DHC_O_Universe, 85, 0 }, - { "nds-tree-name", "X", DHC_O_Universe, 86, 0 }, + { "nds-tree-name", "t", DHC_O_Universe, 86, 0 }, { "nds-context", "X", DHC_O_Universe, 87, 0 }, { 0L, 0L, 0, 0, 0 }, { 0L, 0L, 0, 0, 0 }, @@ -555,7 +555,7 @@ { 0L, 0L, 0, 0, 0 }, { 0L, 0L, 0, 0, 0 }, { 0L, 0L, 0, 0, 0 }, - { "subnet-selection", "X", DHC_O_Universe, 118, 0 }, + { "subnet-selection", "I", DHC_O_Universe, 118, 0 }, { 0L, 0L, 0, 0, 0 }, { 0L, 0L, 0, 0, 0 }, { 0L, 0L, 0, 0, 0 }, ++++++ dhcdbd-dbus-reconnect-thoenig-02.patch -> dhcdbd-dbus-reconnect-thoenig-03.patch ++++++ --- dhcdbd/dhcdbd-dbus-reconnect-thoenig-02.patch 2006-08-16 11:07:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/dhcdbd/dhcdbd-dbus-reconnect-thoenig-03.patch 2006-10-25 12:53:36.000000000 +0200 @@ -1,27 +1,116 @@ -This patch makes dhcdbd survive D-BUS restarts. - -* Call new function dbus_svc_reconnect () if we're losing connection to the bus. This will cause the main - loop to break and clean up the old context. - -* dbus_svc_shutdown (): Call dbus_connection_unref twice (== ref count should be 0 then). This ensures that - libdbus will give us a fresh connection to the bus rather than the dead one once the sytem bus is back. - -* As we only know which bus (system, session) to connect in dhcdbd.c this patch adds a - - do { - ... - while (reconnect); - - to dhcdbd_run (). If the quit, shutdown or exit method of dhcdbd is called, we will _not_ try to reconnect. - -* If libdbus' dbus_bus_get () fails (either on start-up or reconnect) we're waiting three seconds and give it - another shot. - -Signed-off-by Timo Hoenig <thoenig@suse.de> - ---- dhcdbd.c 2006-03-21 17:24:12.000000000 +0100 -+++ dhcdbd.c 2006-03-21 17:25:54.000000000 +0100 -@@ -2729,7 +2729,7 @@ +diff -urN dhcdbd-1.12/dbus_service.c dhcdbd-1.12_mod/dbus_service.c +--- dhcdbd-1.12/dbus_service.c 2006-10-25 11:53:00.000000000 +0200 ++++ dhcdbd-1.12_mod/dbus_service.c 2006-10-25 12:02:36.000000000 +0200 +@@ -78,6 +78,7 @@ + struct timeval tv; + } DBusConnectionTimeout; + ++#define RECONNECT 254 + #define SHUTDOWN 255 + + static void no_free( void *p){} +@@ -1219,7 +1220,6 @@ + return; + fd = dbus_watch_get_fd( w ); + flags = dbus_watch_get_flags( w ); +- if( cs->dh != 0L ) (*(cs->dh))("handle_watch: %d", dbus_watch_get_fd( w )); + if ( (flags & DBUS_WATCH_READABLE) && (FD_ISSET(fd, &(cs->s_r_fds))) ) + dbus_watch_handle(w, DBUS_WATCH_READABLE); + if ( (flags & DBUS_WATCH_WRITABLE) && (FD_ISSET(fd, &(cs->s_w_fds))) ) +@@ -1311,12 +1311,12 @@ + } + + void +-dbus_svc_main_loop( DBusConnectionState *cs, void (*idle_handler)(DBusConnectionState *) ) ++dbus_svc_main_loop( DBusConnectionState *cs, void (*idle_handler)(DBusConnectionState *), int *reconnect ) + { + struct timeval timeout={0,200000}; + int n_fds; + +- while( cs->status != SHUTDOWN ) ++ while( cs->status != SHUTDOWN && cs->status != RECONNECT ) + { + cs->s_r_fds = cs->r_fds; + cs->s_w_fds = cs->w_fds; +@@ -1345,6 +1345,15 @@ + if( idle_handler != 0L ) + (*idle_handler)(cs); + } ++ ++ *reconnect = (cs->status == RECONNECT) ? 1 : 0; ++} ++ ++ ++void ++dbus_svc_reconnect( DBusConnectionState *cs ) ++{ ++ cs->status = RECONNECT; + } + + void +@@ -1358,7 +1367,7 @@ + ( + dbus_svc_DBUS_TYPE bus, + char *name, +- dbus_svc_ErrorHandler eh , ++ dbus_svc_ErrorHandler eh, + dbus_svc_ErrorHandler dh + ) + { +@@ -1370,10 +1379,14 @@ + + dbus_error_init(&error); + +- if ( (connection = dbus_bus_get (bus, &error)) == 0L ) +- { +- (*eh)("dbus_svc_init failed: %s %s",error.name, error.message); +- return ( 0L ); ++ connection = NULL; ++ while (connection == NULL) { ++ if ( (connection = dbus_bus_get (bus, &error)) == 0L ) { ++ dbus_error_free (&error); ++ (*eh)("dbus_svc_init failed: %s %s",error.name, error.message); ++ dbus_error_init(&error); ++ sleep (3); ++ } + } + + dbus_connection_set_exit_on_disconnect(connection, FALSE); +@@ -1450,8 +1463,8 @@ + tdestroy( cs->roots, free_root); + cs->roots=0L; + +- +- dbus_connection_disconnect( cs->connection ); +- dbus_shutdown(); ++ dbus_connection_unref( cs->connection ); ++ dbus_connection_unref( cs->connection ); ++ + free( cs ); + } +diff -urN dhcdbd-1.12/dbus_service.h dhcdbd-1.12_mod/dbus_service.h +--- dhcdbd-1.12/dbus_service.h 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.12_mod/dbus_service.h 2006-10-25 11:53:42.000000000 +0200 +@@ -114,12 +114,14 @@ + * "eh" will be called for all errors from this server session. + */ + +-extern void dbus_svc_main_loop( DBUS_SVC, void (*idle_handler)(DBUS_SVC) ); ++extern void dbus_svc_main_loop( DBUS_SVC, void (*idle_handler)(DBUS_SVC), int * ); + /* + * Enter message processing loop. + * If "idle_handler" is non-null, it will be called once per iteration of loop. + */ + ++extern void dbus_svc_reconnect( DBUS_SVC ); ++ + extern void dbus_svc_quit( DBUS_SVC ); + /* + * Exit message processing loop +diff -urN dhcdbd-1.12/dhcdbd.c dhcdbd-1.12_mod/dhcdbd.c +--- dhcdbd-1.12/dhcdbd.c 2006-10-25 11:53:00.000000000 +0200 ++++ dhcdbd-1.12_mod/dhcdbd.c 2006-10-25 11:53:42.000000000 +0200 +@@ -2776,7 +2776,7 @@ ) { dhcdbd_debug("Filtered QUIT message OK"); @@ -30,7 +119,7 @@ return HANDLED; } return NOT_HANDLED; -@@ -2742,68 +2742,73 @@ +@@ -2789,68 +2789,73 @@ struct sigaction sa; char path[1024]; int fd, l; @@ -156,116 +245,9 @@ return( 0 ); } ---- dbus_service.c 2006-01-17 22:23:51.000000000 +0100 -+++ dbus_service.c 2006-03-21 17:24:28.000000000 +0100 -@@ -78,6 +78,7 @@ - struct timeval tv; - } DBusConnectionTimeout; - -+#define RECONNECT 254 - #define SHUTDOWN 255 - - static void no_free( void *p){} -@@ -604,6 +605,7 @@ - { - DBusConnectionState *cs = p; - -+ - cs->currentMessage = message; - cs->rejectMessage = 0; - -@@ -1316,12 +1318,12 @@ - } - - void --dbus_svc_main_loop( DBusConnectionState *cs, void (*idle_handler)(DBusConnectionState *) ) -+dbus_svc_main_loop( DBusConnectionState *cs, void (*idle_handler)(DBusConnectionState *), int *reconnect ) - { - struct timeval timeout={0,200000}; - int n_fds; - -- while( cs->status != SHUTDOWN ) -+ while( cs->status != SHUTDOWN && cs->status != RECONNECT ) - { - cs->s_r_fds = cs->r_fds; - cs->s_w_fds = cs->w_fds; -@@ -1350,6 +1352,15 @@ - if( idle_handler != 0L ) - (*idle_handler)(cs); - } -+ -+ *reconnect = (cs->status == RECONNECT) ? 1 : 0; -+} -+ -+ -+void -+dbus_svc_reconnect( DBusConnectionState *cs ) -+{ -+ cs->status = RECONNECT; - } - - void -@@ -1363,7 +1374,7 @@ - ( - dbus_svc_DBUS_TYPE bus, - char *name, -- dbus_svc_ErrorHandler eh , -+ dbus_svc_ErrorHandler eh, - dbus_svc_ErrorHandler dh - ) - { -@@ -1375,10 +1386,14 @@ - - dbus_error_init(&error); - -- if ( (connection = dbus_bus_get (bus, &error)) == 0L ) -- { -- (*eh)("dbus_svc_init failed: %s %s",error.name, error.message); -- return ( 0L ); -+ connection = NULL; -+ while (connection == NULL) { -+ if ( (connection = dbus_bus_get (bus, &error)) == 0L ) { -+ dbus_error_free (&error); -+ (*eh)("dbus_svc_init failed: %s %s",error.name, error.message); -+ dbus_error_init(&error); -+ sleep (3); -+ } - } - - dbus_connection_set_exit_on_disconnect(connection, FALSE); -@@ -1455,8 +1470,8 @@ - tdestroy( cs->roots, free_root); - cs->roots=0L; - -- -- dbus_connection_disconnect( cs->connection ); -- dbus_shutdown(); -+ dbus_connection_unref( cs->connection ); -+ dbus_connection_unref( cs->connection ); -+ - free( cs ); - } ---- dbus_service.h 2006-01-17 22:23:51.000000000 +0100 -+++ dbus_service.h 2006-03-21 17:24:28.000000000 +0100 -@@ -114,12 +114,14 @@ - * "eh" will be called for all errors from this server session. - */ - --extern void dbus_svc_main_loop( DBUS_SVC, void (*idle_handler)(DBUS_SVC) ); -+extern void dbus_svc_main_loop( DBUS_SVC, void (*idle_handler)(DBUS_SVC), int * ); - /* - * Enter message processing loop. - * If "idle_handler" is non-null, it will be called once per iteration of loop. - */ - -+extern void dbus_svc_reconnect( DBUS_SVC ); -+ - extern void dbus_svc_quit( DBUS_SVC ); - /* - * Exit message processing loop - ---- tests/test_binary.c 2006/01/17 21:23:51 1.1 -+++ tests/test_binary.c 2006/03/21 13:50:26 +diff -urN dhcdbd-1.12/tests/test_binary.c dhcdbd-1.12_mod/tests/test_binary.c +--- dhcdbd-1.12/tests/test_binary.c 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.12_mod/tests/test_binary.c 2006-10-25 11:53:42.000000000 +0200 @@ -266,6 +266,7 @@ int main( int argc, char **argv, char **envp ) { @@ -283,8 +265,9 @@ return(0); } ---- tests/test_prospective_subscriber.c 2006/01/17 21:23:51 1.1 -+++ tests/test_prospective_subscriber.c 2006/03/21 13:50:41 +diff -urN dhcdbd-1.12/tests/test_prospective_subscriber.c dhcdbd-1.12_mod/tests/test_prospective_subscriber.c +--- dhcdbd-1.12/tests/test_prospective_subscriber.c 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.12_mod/tests/test_prospective_subscriber.c 2006-10-25 11:53:42.000000000 +0200 @@ -184,7 +184,7 @@ int main( int argc, char **argv, char **envp ) { @@ -303,8 +286,9 @@ return(0); } ---- tests/test_subscriber.c 2006/01/17 21:23:51 1.1 -+++ tests/test_subscriber.c 2006/03/21 13:50:59 +diff -urN dhcdbd-1.12/tests/test_subscriber.c dhcdbd-1.12_mod/tests/test_subscriber.c +--- dhcdbd-1.12/tests/test_subscriber.c 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.12_mod/tests/test_subscriber.c 2006-10-25 11:53:42.000000000 +0200 @@ -184,6 +184,7 @@ int main( int argc, char **argv, char **envp ) { @@ -322,8 +306,9 @@ return(0); } ---- tests/test_subscriber_dbus.c 2006/01/17 21:23:51 1.1 -+++ tests/test_subscriber_dbus.c 2006/03/21 13:51:16 +diff -urN dhcdbd-1.12/tests/test_subscriber_dbus.c dhcdbd-1.12_mod/tests/test_subscriber_dbus.c +--- dhcdbd-1.12/tests/test_subscriber_dbus.c 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.12_mod/tests/test_subscriber_dbus.c 2006-10-25 11:53:42.000000000 +0200 @@ -174,6 +174,7 @@ int main( int argc, char **argv, char **envp ) { @@ -341,4 +326,3 @@ return(0); } - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org