head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2010Q1:1.7.0.54 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.52 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.50 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.48 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.46 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.36 pkgsrc-2008Q1:1.7.0.34 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.32 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.30 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.28 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.26 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.24 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.22 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.20 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.18 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.16 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.14 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.12 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.10 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.8 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.6 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3; locks; strict; comment @# @; 1.8 date 2010.05.03.10.17.05; author is; state dead; branches; next 1.7; 1.7 date 2003.12.11.16.05.40; author adam; state Exp; branches; next 1.6; 1.6 date 2001.02.28.10.26.02; author wiz; state Exp; branches; next 1.5; 1.5 date 2001.02.14.14.28.58; author is; state Exp; branches; next 1.4; 1.4 date 2000.01.04.17.49.43; author bouyer; state Exp; branches; next 1.3; 1.3 date 99.06.03.14.22.09; author tron; state Exp; branches; next 1.2; 1.2 date 99.06.01.21.15.02; author tron; state Exp; branches; next 1.1; 1.1 date 99.05.31.22.22.09; author tron; state Exp; branches; next ; desc @@ 1.8 log @Forgotten patches. Sorry for the inconvenience caused. @ text @$NetBSD: patch-ac,v 1.7 2003/12/11 16:05:40 adam Exp $ --- floppyd.c.orig 2002-11-02 10:55:24.000000000 +0000 +++ floppyd.c @@@@ -583,7 +583,7 @@@@ static uid_t getuserid(char *user) } else { - uid = 65535; + uid = getuserid("nobody"); } #if DEBUG @@@@ -609,7 +609,7 @@@@ static uid_t getgroupid(uid_t uid) } else { - gid = 65535; + gid = getgroupid(uid); } #if DEBUG @ 1.7 log @Changes 3.9.9: * Large disk fixes, especially for Solaris * Floppyd robustness * Zip 250 support in mzip * Protect against division by zero when reading BSD disks * Fixed parsing of Unix filenames ending with slash * Fixes for floppyd to work with current protocol version of floppyd * Warn for invalid partition numbers * Support for geometry-less Atari disks * Support for byte-swapping disks * Fixed max numbers of sectors for FAT12 and FAT16 See ChangeLog for details @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @We want RCS Ids in the patches. This is one of the things pkglint checks, so _please_ use it. @ text @d2 4 a5 3 --- floppyd.c.orig Sun May 28 13:20:30 2000 +++ floppyd.c Wed Feb 14 13:42:45 2001 @@@@ -574,7 +574,7 @@@@ d13 2 a14 2 #ifdef DEBUG @@@@ -600,7 +600,7 @@@@ d22 1 a22 1 #ifdef DEBUG @ 1.5 log @Upgrade to version 3.9.7. Mostly from PR 12033 by Martti Kuparinen. @ text @d1 1 @ 1.4 log @works on solaris @ text @d1 9 a9 5 $NetBSD: patch-ac,v 1.3 1999/06/03 14:22:09 tron Exp $ --- floppyd.c.old Mon Dec 13 18:11:58 1999 +++ floppyd.c Mon Dec 13 18:16:52 1999 @@@@ -85,7 +85,9 @@@@ d11 8 a18 5 typedef unsigned char Byte; typedef unsigned long Dword; +#ifndef OS_solaris2 typedef unsigned long ipaddr_t; +#endif d20 1 a20 13 enum Opcodes { OP_READ, @@@@ -758,8 +760,8 @@@@ int run_as_server = 0; ipaddr_t bind_ip = INADDR_ANY; short bind_port = FLOPPYD_DEFAULT_PORT; - uid_t run_uid = 65535; - gid_t run_gid = 65535; + uid_t run_uid = getuserid("nobody"); + gid_t run_gid = getgroupid(run_uid); int sock; int port_is_supplied = 0; int no_local = 0; @ 1.3 log @Adapt this patch to version 3.9.5. @ text @d1 1 a1 1 $NetBSD$ d3 13 a15 3 --- floppyd.c.orig Thu Jun 3 15:12:56 1999 +++ floppyd.c Thu Jun 3 15:19:46 1999 @@@@ -758,8 +758,8 @@@@ @ 1.2 log @Enhance "floppyd" to get UID of "nobody" from the password database. Patch supplied by Antti Kantee. @ text @d3 3 a5 47 --- floppyd.cpp.orig Mon May 31 14:46:31 1999 +++ floppyd.cpp Tue Jun 1 10:53:28 1999 @@@@ -24,6 +24,7 @@@@ #endif #define FLOPPYD_DEFAULT_PORT 5703 +#define NOBODY "nobody" extern int errno; // ######################################################################### @@@@ -395,6 +396,8 @@@@ /* * Find the userid of the specified user. + * Use 'nobody' if not specified and revert to 65535 only if + * 'nobody' cannot be determined. */ static uid_t getuserid(char *user) { @@@@ -411,7 +414,10 @@@@ } else { - uid = 65535; + if((pw = getpwnam(NOBODY)) != NULL) + uid = pw->pw_uid; + else + uid = 65535; } #ifdef DEBUG @@@@ -527,12 +533,12 @@@@ { int new_sock; struct sockaddr_in addr; - int len; + socklen_t len; /* * Ignore dead servers so no zombies should be left hanging. */ - signal(SIGCLD, SIG_IGN); + signal(SIGCHLD, SIG_IGN); for (;;) { @@@@ -613,11 +619,13 @@@@ d11 2 a12 3 + uid_t run_uid; + gid_t run_gid; + pid_t run_pid; a15 40 + int ug_given = 0; char *server_hostname=NULL; char* device_name = NULL; @@@@ -644,6 +652,7 @@@@ break; case 'r': + ug_given = 1; run_uid = getuserid(optarg); run_gid = getgroupid(run_uid); break; @@@@ -663,9 +672,15 @@@@ break; } } + + if(!ug_given) { + run_uid = getuserid(NOBODY); + run_gid = getgroupid(run_uid); + } + if(!run_as_server) { struct sockaddr_in addr; - int len = sizeof(addr); + socklen_t len = sizeof(addr); /* try to find out port that we are connected to */ if(getsockname(0, (sockaddr*) &addr, &len) >= 0 && @@@@ -836,8 +851,8 @@@@ /* * Start a new session and group. */ - setsid(); - setpgrp(); + run_pid = setsid(); + setpgrp(0, run_pid); close(2); open("/dev/null", O_WRONLY); @ 1.1 log @- Enhance "configure" target so that "floppyd" will be built on systems with X11 installed. - Fix compliation problems in "floppyd.cpp" with the patch supplied by Antti Kantee in PR pkg/7670. - Remove "floppyd" manual page if the binary isn't built and installed. @ text @d3 32 a34 3 --- floppyd.cpp.orig Sun May 30 18:05:46 1999 +++ floppyd.cpp Sun May 30 18:25:37 1999 @@@@ -527,12 +527,12 @@@@ d49 3 a51 1 @@@@ -615,6 +615,7 @@@@ d53 4 a56 2 uid_t run_uid = 65535; gid_t run_gid = 65535; d61 15 a75 1 @@@@ -665,7 +666,7 @@@@ d77 6 d90 1 a90 1 @@@@ -836,8 +837,8 @@@@ @