Hello community, here is the log from the commit of package dhcdbd checked in at Wed May 31 02:35:30 CEST 2006. -------- --- dhcdbd/dhcdbd.changes 2006-05-09 15:32:35.000000000 +0200 +++ dhcdbd/dhcdbd.changes 2006-05-30 18:09:24.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 30 18:08:13 CEST 2006 - rml@suse.de + +- Send only the most significant hostname, not the entire FQDN, + from /etc/HOSTNAME when DHCLIENT_HOSTNAME_OPTION is enabled + (Novell bug #179903) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcdbd.spec ++++++ --- /var/tmp/diff_new_pack.hvFEgl/_old 2006-05-31 02:35:19.000000000 +0200 +++ /var/tmp/diff_new_pack.hvFEgl/_new 2006-05-31 02:35:19.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-devel Summary: DHCP D-BUS Daemon Version: 1.12 -Release: 19 +Release: 20 License: GPL Group: Productivity/Networking/Boot/Utilities URL: http://people.redhat.com/~jvdias/dhcdbd @@ -71,6 +71,10 @@ %dir /var/lib/named %changelog -n dhcdbd +* Tue May 30 2006 - rml@suse.de +- Send only the most significant hostname, not the entire FQDN, + from /etc/HOSTNAME when DHCLIENT_HOSTNAME_OPTION is enabled + (Novell bug #179903) * Tue May 09 2006 - rml@suse.de - Fix 64-bit build (use pkg-config like we should) * Thu May 04 2006 - rml@suse.de ++++++ dhcdbd-set-hostname.patch ++++++ --- /var/tmp/diff_new_pack.hvFEgl/_old 2006-05-31 02:35:19.000000000 +0200 +++ /var/tmp/diff_new_pack.hvFEgl/_new 2006-05-31 02:35:20.000000000 +0200 @@ -1,12 +1,6 @@ - Makefile | 19 +++-- - dhcdbd.c | 47 +++++++++++++- - shvar.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - shvar.h | 74 +++++++++++++++++++++++ - 4 files changed, 328 insertions(+), 12 deletions(-) - diff -urN dhcdbd-1.12/dhcdbd.c dhcdbd/dhcdbd.c --- dhcdbd-1.12/dhcdbd.c 2006-01-17 16:23:51.000000000 -0500 -+++ dhcdbd/dhcdbd.c 2006-05-04 16:07:10.000000000 -0400 ++++ dhcdbd/dhcdbd.c 2006-05-30 12:05:27.000000000 -0400 @@ -20,9 +20,7 @@ #include "dbus_service.h" #include "dhcdbd.h" @@ -30,7 +24,7 @@ sigset_t ss; pid_t kill_pid=0; char dhc_if_conf_file[1024]; -@@ -911,6 +910,46 @@ +@@ -911,6 +910,54 @@ return -1; strcpy(dhc_args[arg], "-q"); @@ -45,13 +39,21 @@ + FILE *f; + + f = fopen ("/etc/HOSTNAME", "r"); -+ if (f > 0) { ++ if (f) { + if (fgets (hostname, HOST_NAME_MAX, f)) { -+ size_t len; ++ char *p; + -+ len = strlen (hostname); -+ if (hostname[len-1] == '\n') -+ hostname[len-1] = '\0'; ++ /* just want the most significant hostname */ ++ p = strchr (hostname, '.'); ++ if (p) ++ p[0] = '\0'; ++ else { ++ size_t len; ++ ++ len = strlen (hostname); ++ if (hostname[len-1] == '\n') ++ hostname[len-1] = '\0'; ++ } + } else { + fclose (f); + goto out; @@ -79,7 +81,7 @@ strcpy(dhc_args[arg], "-e"); diff -urN dhcdbd-1.12/Makefile dhcdbd/Makefile --- dhcdbd-1.12/Makefile 2006-01-17 16:23:51.000000000 -0500 -+++ dhcdbd/Makefile 2006-05-04 16:04:17.000000000 -0400 ++++ dhcdbd/Makefile 2006-05-30 12:01:24.000000000 -0400 @@ -7,28 +7,31 @@ LDFLAGS ?= -g DESTDIR ?= / @@ -122,7 +124,7 @@ (cd tests; make) diff -urN dhcdbd-1.12/shvar.c dhcdbd/shvar.c --- dhcdbd-1.12/shvar.c 1969-12-31 19:00:00.000000000 -0500 -+++ dhcdbd/shvar.c 2006-05-04 16:03:59.000000000 -0400 ++++ dhcdbd/shvar.c 2006-05-30 12:01:24.000000000 -0400 @@ -0,0 +1,200 @@ +/* + * shvar.c @@ -326,7 +328,7 @@ +} diff -urN dhcdbd-1.12/shvar.h dhcdbd/shvar.h --- dhcdbd-1.12/shvar.h 1969-12-31 19:00:00.000000000 -0500 -+++ dhcdbd/shvar.h 2006-05-04 16:02:53.000000000 -0400 ++++ dhcdbd/shvar.h 2006-05-30 12:01:24.000000000 -0400 @@ -0,0 +1,74 @@ +/* + * shvar.h ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...