Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1
dhcpcd
dhcpcd-3.2.3-suse.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File dhcpcd-3.2.3-suse.diff of Package dhcpcd
diff -u dhcpcd-3.2.3/configure.c dhcpcd-3.2.3-suse/configure.c --- dhcpcd-3.2.3/configure.c 2008-02-25 09:28:19.000000000 +0100 +++ dhcpcd-3.2.3-suse/configure.c 2008-04-22 17:30:26.000000000 +0200 @@ -400,7 +642,7 @@ #ifdef ENABLE_NIS #define PREFIXSIZE 256 -static int make_nis (const char *ifname, const dhcp_t *dhcp) +static int make_nis (const char *ifname, const dhcp_t *dhcp, const options_t *options) { FILE *f; address_t *address; @@ -417,7 +659,8 @@ fprintf (f, "# Generated by dhcpcd for interface %s\n", ifname); if (dhcp->nisdomain) { - setdomainname (dhcp->nisdomain, (int) strlen (dhcp->nisdomain)); + if( options->donisdom) + setdomainname (dhcp->nisdomain, strlen (dhcp->nisdomain)); if (dhcp->nisservers) snprintf (prefix, PREFIXSIZE, "domain %s server", @@ -754,7 +1006,7 @@ #ifdef ENABLE_NIS if (options->donis && (dhcp->nisservers || dhcp->nisdomain)) - make_nis(iface->name, dhcp); + make_nis(iface->name, dhcp, options); #endif curhostname = xmalloc (sizeof (char) * MAXHOSTNAMELEN); diff -u dhcpcd-3.2.3/dhcpcd.8.in dhcpcd-3.2.3-suse/dhcpcd.8.in --- dhcpcd-3.2.3/dhcpcd.8.in 2008-02-25 09:28:19.000000000 +0100 +++ dhcpcd-3.2.3-suse/dhcpcd.8.in 2008-04-16 10:31:40.000000000 +0200 @@ -29,7 +29,7 @@ .Nd an RFC 2131 compliant DHCP client .Sh SYNOPSIS .Nm -.Op Fl dknpAEGHMLNRSTY +.Op Fl dknpADEGHMLNRSTY .Op Fl c , -script Ar script .Op Fl h , -hostname Ar hostname .Op Fl i , -classid Ar classid @@ -309,6 +313,8 @@ Don't touch .Pa /etc/yp.conf or restart the ypbind service. +.It Fl D , -nisdomain +Forces dhcpcd to set domainname of the host to the domainname option supplied by DHCP server. .El .Sh NOTES Because diff -u dhcpcd-3.2.3/dhcpcd.c dhcpcd-3.2.3-suse/dhcpcd.c --- dhcpcd-3.2.3/dhcpcd.c 2008-02-25 09:28:19.000000000 +0100 +++ dhcpcd-3.2.3-suse/dhcpcd.c 2008-04-22 17:16:40.000000000 +0200 @@ -71,14 +71,15 @@ {"userclass", required_argument, NULL, 'u'}, {"exit", no_argument, NULL, 'x'}, {"lastlease", no_argument, NULL, 'E'}, + {"nonisdom", no_argument, NULL, 'D'}, {"fqdn", required_argument, NULL, 'F'}, {"nogateway", no_argument, NULL, 'G'}, {"sethostname", no_argument, NULL, 'H'}, {"clientid", optional_argument, NULL, 'I'}, {"noipv4ll", no_argument, NULL, 'L'}, {"nomtu", no_argument, NULL, 'M'}, {"nontp", no_argument, NULL, 'N'}, {"nodns", no_argument, NULL, 'R'}, {"msscr", no_argument, NULL, 'S'}, {"test", no_argument, NULL, 'T'}, {"nonis", no_argument, NULL, 'Y'}, @@ -135,7 +138,7 @@ static void usage (void) { - printf ("usage: "PACKAGE" [-adknpEGHMNRSTY] [-c script] [-h hostname] [-i classID]\n" + printf ("usage: "PACKAGE" [-adknpEGHKMNRSTYD] [-c script] [-h hostname] [-i classID]\n" " [-l leasetime] [-m metric] [-r ipaddress] [-s ipaddress]\n" " [-t timeout] [-u userclass] [-F none | ptr | both]\n" " [-I clientID] <interface>\n"); @@ -166,10 +169,11 @@ snprintf (options->classid, CLASS_ID_MAX_LEN, "%s %s", PACKAGE, VERSION); options->doarp = true; options->dodns = true; options->domtu = true; options->donis = true; + options->donisdom = false; options->dontp = true; options->dogateway = true; options->daemonise = true; @@ -186,7 +191,7 @@ /* Don't set any optional arguments here so we retain POSIX * compatibility with getopt */ while ((opt = getopt_long(argc, argv, EXTRA_OPTS - "c:dh:i:kl:m:npr:s:t:u:xAEF:GHI:LMNRSTY", + "c:dh:i:kl:m:npr:s:t:u:xAEF:GHI:LMNRSTYD", longopts, &option_index)) != -1) { switch (opt) { @@ -408,6 +416,10 @@ case 'Y': options->donis = false; break; + case 'D': + options->donisdom = true; + break; + case '?': usage (); goto abort; diff -u dhcpcd-3.2.3/dhcpcd.h dhcpcd-3.2.3-suse/dhcpcd.h --- dhcpcd-3.2.3/dhcpcd.h 2008-02-25 09:28:19.000000000 +0100 +++ dhcpcd-3.2.3-suse/dhcpcd.h 2008-04-16 10:25:49.000000000 +0200 @@ -70,11 +70,12 @@ int dohostname; bool domtu; bool donis; + bool donisdom; bool dontp; bool dolastlease; bool doinform; bool dorequest; bool doipv4ll; bool doduid; int domscsr; diff -u dhcpcd-3.2.3/Makefile dhcpcd-3.2.3-suse/Makefile --- dhcpcd-3.2.3/Makefile 2008-02-25 09:28:19.000000000 +0100 +++ dhcpcd-3.2.3-suse/Makefile 2008-04-22 17:38:38.000000000 +0200 @@ -31,4 +31,4 @@ echo "#define VERSION \"${VERSION}\""> version.h .in: - sed 's:@PREFIX@:${PREFIX}:g; s:@INFODIR@:${INFOD}:g' $< > $@ + sed 's#@PREFIX@#${PREFIX}#g; s#@INFODIR@#${INFOD}#g' $< > $@ Gemeinsame Unterverzeichnisse: dhcpcd-3.2.3/mk und dhcpcd-3.2.3-suse/mk.
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor