Date: Tue, 14 Feb 2012 19:58:01 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r231707 - in user/attilio/vmcontention: . bin/sh crypto/openssh etc etc/defaults etc/devd etc/mtree etc/rc.d gnu/usr.bin/cc/cc_tools include include/rpc include/xlocale lib/libc/arm/gen... Message-ID: <201202141958.q1EJw1Yo015651@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Tue Feb 14 19:58:00 2012 New Revision: 231707 URL: http://svn.freebsd.org/changeset/base/231707 Log: MFC Added: user/attilio/vmcontention/etc/rc.d/utx - copied unchanged from r231706, head/etc/rc.d/utx user/attilio/vmcontention/include/xlocale/ - copied from r231706, head/include/xlocale/ user/attilio/vmcontention/lib/libc/arm/gen/__aeabi_read_tp.c - copied unchanged from r231706, head/lib/libc/arm/gen/__aeabi_read_tp.c user/attilio/vmcontention/sys/conf/WITHOUT_SOURCELESS - copied unchanged from r231706, head/sys/conf/WITHOUT_SOURCELESS user/attilio/vmcontention/sys/conf/WITHOUT_SOURCELESS_HOST - copied unchanged from r231706, head/sys/conf/WITHOUT_SOURCELESS_HOST user/attilio/vmcontention/sys/conf/WITHOUT_SOURCELESS_UCODE - copied unchanged from r231706, head/sys/conf/WITHOUT_SOURCELESS_UCODE user/attilio/vmcontention/sys/dev/oce/ - copied from r231706, head/sys/dev/oce/ user/attilio/vmcontention/sys/modules/oce/ - copied from r231706, head/sys/modules/oce/ user/attilio/vmcontention/tools/regression/bin/sh/builtins/hash4.0 - copied unchanged from r231706, head/tools/regression/bin/sh/builtins/hash4.0 user/attilio/vmcontention/tools/test/hwpmc/ - copied from r231706, head/tools/test/hwpmc/ user/attilio/vmcontention/tools/test/ptrace/ - copied from r231706, head/tools/test/ptrace/ user/attilio/vmcontention/usr.sbin/utx/ - copied from r231706, head/usr.sbin/utx/ Deleted: user/attilio/vmcontention/include/_xlocale_ctype.h user/attilio/vmcontention/sys/amd64/conf/WITHOUT_SOURCELESS user/attilio/vmcontention/sys/amd64/conf/WITHOUT_SOURCELESS_HOST user/attilio/vmcontention/sys/amd64/conf/WITHOUT_SOURCELESS_UCODE user/attilio/vmcontention/sys/i386/conf/WITHOUT_SOURCELESS user/attilio/vmcontention/sys/i386/conf/WITHOUT_SOURCELESS_HOST user/attilio/vmcontention/sys/i386/conf/WITHOUT_SOURCELESS_UCODE user/attilio/vmcontention/usr.sbin/utxrm/ Modified: user/attilio/vmcontention/UPDATING user/attilio/vmcontention/bin/sh/exec.c user/attilio/vmcontention/crypto/openssh/auth2.c user/attilio/vmcontention/crypto/openssh/channels.c user/attilio/vmcontention/crypto/openssh/channels.h user/attilio/vmcontention/crypto/openssh/kex.c user/attilio/vmcontention/crypto/openssh/loginrec.c (contents, props changed) user/attilio/vmcontention/crypto/openssh/readconf.c user/attilio/vmcontention/crypto/openssh/readconf.h user/attilio/vmcontention/crypto/openssh/servconf.c user/attilio/vmcontention/crypto/openssh/sftp.1 user/attilio/vmcontention/crypto/openssh/ssh.c user/attilio/vmcontention/crypto/openssh/sshd.c user/attilio/vmcontention/crypto/openssh/sshd_config.5 user/attilio/vmcontention/crypto/openssh/version.h user/attilio/vmcontention/etc/defaults/rc.conf user/attilio/vmcontention/etc/devd/usb.conf user/attilio/vmcontention/etc/mtree/BSD.include.dist user/attilio/vmcontention/etc/rc.d/LOGIN user/attilio/vmcontention/etc/rc.d/Makefile user/attilio/vmcontention/etc/rc.d/SERVERS user/attilio/vmcontention/etc/rc.d/addswap user/attilio/vmcontention/etc/rc.d/amd user/attilio/vmcontention/etc/rc.d/apmd user/attilio/vmcontention/etc/rc.d/cleanvar user/attilio/vmcontention/etc/rc.d/keyserv user/attilio/vmcontention/etc/rc.d/lockd user/attilio/vmcontention/etc/rc.d/mountd user/attilio/vmcontention/etc/rc.d/nfsd user/attilio/vmcontention/etc/rc.d/statd user/attilio/vmcontention/etc/rc.d/var user/attilio/vmcontention/etc/rc.d/watchdogd user/attilio/vmcontention/etc/rc.d/ypbind user/attilio/vmcontention/etc/rc.d/yppasswdd user/attilio/vmcontention/etc/rc.d/ypserv user/attilio/vmcontention/etc/rc.d/ypset user/attilio/vmcontention/etc/rc.d/ypupdated user/attilio/vmcontention/etc/rc.d/ypxfrd user/attilio/vmcontention/etc/rc.subr user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/auto-host.h user/attilio/vmcontention/include/Makefile user/attilio/vmcontention/include/ctype.h user/attilio/vmcontention/include/langinfo.h user/attilio/vmcontention/include/locale.h user/attilio/vmcontention/include/rpc/svc.h user/attilio/vmcontention/include/runetype.h user/attilio/vmcontention/include/string.h user/attilio/vmcontention/include/time.h user/attilio/vmcontention/include/wchar.h user/attilio/vmcontention/include/wctype.h user/attilio/vmcontention/include/xlocale.h user/attilio/vmcontention/lib/libc/arm/gen/Makefile.inc user/attilio/vmcontention/lib/libc/db/man/hash.3 user/attilio/vmcontention/lib/libc/gen/arc4random.3 user/attilio/vmcontention/lib/libc/gen/getutxent.3 user/attilio/vmcontention/lib/libc/gen/getutxent.c user/attilio/vmcontention/lib/libc/gen/sysctl.3 user/attilio/vmcontention/lib/libc/locale/Symbol.map user/attilio/vmcontention/lib/libc/locale/btowc.3 user/attilio/vmcontention/lib/libc/locale/setrunelocale.c user/attilio/vmcontention/lib/libc/locale/table.c user/attilio/vmcontention/lib/libc/locale/xlocale.c user/attilio/vmcontention/lib/libc/locale/xlocale_private.h user/attilio/vmcontention/lib/libc/net/getifaddrs.c user/attilio/vmcontention/lib/libc/net/nsdispatch.3 user/attilio/vmcontention/lib/libc/rpc/rpc.3 user/attilio/vmcontention/lib/libc/rpc/rpc_clnt_create.3 user/attilio/vmcontention/lib/libc/sys/getdirentries.2 user/attilio/vmcontention/lib/libc/sys/jail.2 user/attilio/vmcontention/lib/libc/sys/nfssvc.2 user/attilio/vmcontention/lib/libcam/cam.3 user/attilio/vmcontention/lib/libcam/cam_cdbparse.3 user/attilio/vmcontention/lib/libdevstat/devstat.3 user/attilio/vmcontention/lib/libipsec/pfkey.c user/attilio/vmcontention/lib/libradius/libradius.3 user/attilio/vmcontention/lib/libthr/arch/arm/arm/pthread_md.c user/attilio/vmcontention/lib/libthr/arch/arm/include/pthread_md.h user/attilio/vmcontention/lib/libthr/thread/thr_list.c user/attilio/vmcontention/libexec/rtld-elf/arm/reloc.c user/attilio/vmcontention/libexec/rtld-elf/arm/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/mips/reloc.c user/attilio/vmcontention/libexec/rtld-elf/mips/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/rtld.c user/attilio/vmcontention/rescue/rescue/Makefile user/attilio/vmcontention/sbin/bsdlabel/bsdlabel.8 user/attilio/vmcontention/sbin/hastd/rangelock.c user/attilio/vmcontention/sbin/ifconfig/Makefile user/attilio/vmcontention/sbin/ifconfig/ifconfig.c user/attilio/vmcontention/sbin/init/init.8 user/attilio/vmcontention/sbin/init/init.c user/attilio/vmcontention/sbin/newfs_msdos/newfs_msdos.8 user/attilio/vmcontention/share/man/man4/agp.4 user/attilio/vmcontention/share/man/man4/icmp6.4 user/attilio/vmcontention/share/man/man4/ip6.4 user/attilio/vmcontention/share/man/man4/isci.4 (contents, props changed) user/attilio/vmcontention/share/man/man4/mem.4 user/attilio/vmcontention/share/man/man4/mtio.4 user/attilio/vmcontention/share/man/man4/natm.4 user/attilio/vmcontention/share/man/man4/net80211.4 user/attilio/vmcontention/share/man/man4/ng_async.4 user/attilio/vmcontention/share/man/man4/ng_bridge.4 user/attilio/vmcontention/share/man/man4/ng_btsocket.4 user/attilio/vmcontention/share/man/man4/ng_car.4 user/attilio/vmcontention/share/man/man4/ng_ccatm.4 user/attilio/vmcontention/share/man/man4/ng_cisco.4 user/attilio/vmcontention/share/man/man4/ng_etf.4 user/attilio/vmcontention/share/man/man4/ng_hci.4 user/attilio/vmcontention/share/man/man4/ng_l2cap.4 user/attilio/vmcontention/share/man/man4/ng_l2tp.4 user/attilio/vmcontention/share/man/man4/ng_mppc.4 user/attilio/vmcontention/share/man/man4/ng_netflow.4 user/attilio/vmcontention/share/man/man4/ng_one2many.4 user/attilio/vmcontention/share/man/man4/ng_ppp.4 user/attilio/vmcontention/share/man/man4/ng_pppoe.4 user/attilio/vmcontention/share/man/man4/ng_pptpgre.4 user/attilio/vmcontention/share/man/man4/ppi.4 user/attilio/vmcontention/share/man/man5/fs.5 user/attilio/vmcontention/share/man/man5/rc.conf.5 user/attilio/vmcontention/share/man/man9/MD5.9 user/attilio/vmcontention/share/man/man9/bios.9 user/attilio/vmcontention/share/man/man9/bus_space.9 user/attilio/vmcontention/share/man/man9/crypto.9 user/attilio/vmcontention/share/man/man9/device_set_flags.9 user/attilio/vmcontention/share/man/man9/devstat.9 user/attilio/vmcontention/share/man/man9/eventtimers.9 user/attilio/vmcontention/share/man/man9/get_cyclecount.9 user/attilio/vmcontention/share/man/man9/mbchain.9 user/attilio/vmcontention/share/man/man9/mbuf_tags.9 user/attilio/vmcontention/share/man/man9/mdchain.9 user/attilio/vmcontention/share/man/man9/netisr.9 user/attilio/vmcontention/share/man/man9/random.9 user/attilio/vmcontention/share/man/man9/rijndael.9 user/attilio/vmcontention/share/man/man9/zone.9 user/attilio/vmcontention/sys/amd64/amd64/vm_machdep.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/newvers.sh user/attilio/vmcontention/sys/dev/aac/aac.c user/attilio/vmcontention/sys/dev/acpica/Osd/OsdSynch.c user/attilio/vmcontention/sys/dev/ata/ata-queue.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/cxgbe/common/t4_hw.c user/attilio/vmcontention/sys/dev/mps/mps_pci.c user/attilio/vmcontention/sys/dev/mpt/mpilib/mpi_type.h user/attilio/vmcontention/sys/dev/mpt/mpt.c user/attilio/vmcontention/sys/dev/mpt/mpt.h user/attilio/vmcontention/sys/dev/mpt/mpt_cam.c user/attilio/vmcontention/sys/dev/mpt/mpt_pci.c user/attilio/vmcontention/sys/dev/mpt/mpt_reg.h user/attilio/vmcontention/sys/dev/netmap/if_em_netmap.h user/attilio/vmcontention/sys/dev/netmap/if_igb_netmap.h user/attilio/vmcontention/sys/dev/netmap/if_lem_netmap.h user/attilio/vmcontention/sys/dev/netmap/if_re_netmap.h user/attilio/vmcontention/sys/dev/netmap/ixgbe_netmap.h user/attilio/vmcontention/sys/dev/netmap/netmap.c user/attilio/vmcontention/sys/dev/netmap/netmap_kern.h user/attilio/vmcontention/sys/dev/pci/pci.c user/attilio/vmcontention/sys/dev/re/if_re.c user/attilio/vmcontention/sys/dev/sound/pcm/sound.c user/attilio/vmcontention/sys/dev/vge/if_vge.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/kern/subr_syscall.c user/attilio/vmcontention/sys/mips/include/elf.h user/attilio/vmcontention/sys/mips/mips/vm_machdep.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/net/if.h user/attilio/vmcontention/sys/net/rtsock.c user/attilio/vmcontention/sys/net/zlib.h user/attilio/vmcontention/sys/net80211/ieee80211_mesh.c user/attilio/vmcontention/sys/net80211/ieee80211_mesh.h user/attilio/vmcontention/sys/netgraph/ng_cisco.c user/attilio/vmcontention/sys/netgraph/ng_cisco.h user/attilio/vmcontention/sys/netgraph/ng_socket.c user/attilio/vmcontention/sys/netinet/sctp_output.c user/attilio/vmcontention/sys/sys/cdefs.h user/attilio/vmcontention/sys/sys/elf_common.h user/attilio/vmcontention/sys/sys/param.h user/attilio/vmcontention/sys/sys/ptrace.h user/attilio/vmcontention/sys/sys/socket.h user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c user/attilio/vmcontention/sys/vm/vm_map.c user/attilio/vmcontention/sys/vm/vm_map.h user/attilio/vmcontention/sys/vm/vm_mmap.c user/attilio/vmcontention/tools/build/mk/OptionalObsoleteFiles.inc user/attilio/vmcontention/tools/build/options/WITHOUT_UTMPX user/attilio/vmcontention/tools/regression/usr.bin/make/execution/joberr/expected.stdout.1 user/attilio/vmcontention/usr.bin/calendar/calendars/calendar.freebsd user/attilio/vmcontention/usr.bin/chpass/util.c user/attilio/vmcontention/usr.bin/login/login_fbtab.c user/attilio/vmcontention/usr.bin/m4/lib/ohash_interval.3 user/attilio/vmcontention/usr.bin/make/job.c user/attilio/vmcontention/usr.bin/who/who.1 user/attilio/vmcontention/usr.bin/who/who.c user/attilio/vmcontention/usr.bin/write/write.1 user/attilio/vmcontention/usr.bin/write/write.c user/attilio/vmcontention/usr.sbin/Makefile user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 user/attilio/vmcontention/usr.sbin/periodic/periodic.sh user/attilio/vmcontention/usr.sbin/pw/cpdir.c user/attilio/vmcontention/usr.sbin/vipw/vipw.8 Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/crypto/openssh/ (props changed) user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/usr.bin/calendar/ (props changed) Modified: user/attilio/vmcontention/UPDATING ============================================================================== --- user/attilio/vmcontention/UPDATING Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/UPDATING Tue Feb 14 19:58:00 2012 (r231707) @@ -22,6 +22,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20120211: + The getifaddrs upgrade path broken with 20111215 has been restored. + If you have upgraded in between 20111215 and 20120209 you need to + recompile libc again with your kernel. You still need to recompile + world to be able to configure CARP but this restriction already + comes from 20111215. + 20120114: The set_rcvar() function has been removed from /etc/rc.subr. All base and ports rc.d scripts have been updated, so if you have a Modified: user/attilio/vmcontention/bin/sh/exec.c ============================================================================== --- user/attilio/vmcontention/bin/sh/exec.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/bin/sh/exec.c Tue Feb 14 19:58:00 2012 (r231707) @@ -231,7 +231,9 @@ hashcmd(int argc __unused, char **argv _ int verbose; struct cmdentry entry; char *name; + int errors; + errors = 0; verbose = 0; while ((c = nextopt("rv")) != '\0') { if (c == 'r') { @@ -254,19 +256,21 @@ hashcmd(int argc __unused, char **argv _ && cmdp->cmdtype == CMDNORMAL) delete_cmd_entry(); find_command(name, &entry, DO_ERR, pathval()); - if (verbose) { - if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ - cmdp = cmdlookup(name, 0); - if (cmdp != NULL) - printentry(cmdp, verbose); - else - outfmt(out2, "%s: not found\n", name); + if (entry.cmdtype == CMDUNKNOWN) + errors = 1; + else if (verbose) { + cmdp = cmdlookup(name, 0); + if (cmdp != NULL) + printentry(cmdp, verbose); + else { + outfmt(out2, "%s: not found\n", name); + errors = 1; } flushall(); } argptr++; } - return 0; + return errors; } Modified: user/attilio/vmcontention/crypto/openssh/auth2.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/auth2.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/auth2.c Tue Feb 14 19:58:00 2012 (r231707) @@ -223,8 +223,8 @@ input_userauth_request(int type, u_int32 login_cap_t *lc; const char *from_host, *from_ip; - from_host = get_canonical_hostname(options.use_dns); - from_ip = get_remote_ipaddr(); + from_host = get_canonical_hostname(options.use_dns); + from_ip = get_remote_ipaddr(); #endif if (authctxt == NULL) @@ -272,23 +272,23 @@ input_userauth_request(int type, u_int32 } #ifdef HAVE_LOGIN_CAP - if (authctxt->pw != NULL) { - lc = login_getpwclass(authctxt->pw); - if (lc == NULL) - lc = login_getclassbyname(NULL, authctxt->pw); - if (!auth_hostok(lc, from_host, from_ip)) { - logit("Denied connection for %.200s from %.200s [%.200s].", - authctxt->pw->pw_name, from_host, from_ip); - packet_disconnect("Sorry, you are not allowed to connect."); - } - if (!auth_timeok(lc, time(NULL))) { - logit("LOGIN %.200s REFUSED (TIME) FROM %.200s", - authctxt->pw->pw_name, from_host); - packet_disconnect("Logins not available right now."); - } - login_close(lc); - lc = NULL; - } + if (authctxt->pw != NULL) { + lc = login_getpwclass(authctxt->pw); + if (lc == NULL) + lc = login_getclassbyname(NULL, authctxt->pw); + if (!auth_hostok(lc, from_host, from_ip)) { + logit("Denied connection for %.200s from %.200s [%.200s].", + authctxt->pw->pw_name, from_host, from_ip); + packet_disconnect("Sorry, you are not allowed to connect."); + } + if (!auth_timeok(lc, time(NULL))) { + logit("LOGIN %.200s REFUSED (TIME) FROM %.200s", + authctxt->pw->pw_name, from_host); + packet_disconnect("Logins not available right now."); + } + login_close(lc); + lc = NULL; + } #endif /* HAVE_LOGIN_CAP */ /* reset state */ Modified: user/attilio/vmcontention/crypto/openssh/channels.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/channels.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/channels.c Tue Feb 14 19:58:00 2012 (r231707) @@ -824,7 +824,7 @@ channel_tcpwinsz(void) u_int maxlen; /* If we are not on a socket return 128KB. */ - if (!packet_connection_is_on_socket()) + if (!packet_connection_is_on_socket()) return (128 * 1024); tcpwinsz = 0; @@ -854,7 +854,7 @@ channel_pre_open(Channel *c, fd_set *rea limit = MIN(compat20 ? c->remote_window : packet_get_maxsize(), 2 * c->tcpwinsz); - + if (c->istate == CHAN_INPUT_OPEN && limit > 0 && buffer_len(&c->input) < limit && @@ -2687,10 +2687,10 @@ channel_set_af(int af) IPv4or6 = af; } -void +void channel_set_hpn(int disabled, u_int buf_size) { - hpn_disabled = disabled; + hpn_disabled = disabled; buffer_size = buf_size; debug("HPN Disabled: %d, HPN Buffer Size: %d", hpn_disabled, buffer_size); @@ -2856,10 +2856,10 @@ channel_setup_fwd_listener(int type, con c = channel_new("port listener", type, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "port listener", 1); - else - c = channel_new("port listener", type, sock, sock, -1, - buffer_size, CHAN_TCP_PACKET_DEFAULT, - 0, "port listener", 1); + else + c = channel_new("port listener", type, sock, sock, -1, + buffer_size, CHAN_TCP_PACKET_DEFAULT, + 0, "port listener", 1); c->path = xstrdup(host); c->host_port = port_to_connect; c->listening_port = listen_port; Modified: user/attilio/vmcontention/crypto/openssh/channels.h ============================================================================== --- user/attilio/vmcontention/crypto/openssh/channels.h Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/channels.h Tue Feb 14 19:58:00 2012 (r231707) @@ -126,7 +126,7 @@ struct Channel { u_int local_window_max; u_int local_consumed; u_int local_maxpacket; - u_int tcpwinsz; + u_int tcpwinsz; int dynamic_window; int extended_usage; int single_connection; @@ -165,13 +165,10 @@ struct Channel { /* default window/packet sizes for tcp/x11-fwd-channel */ #define CHAN_SES_PACKET_DEFAULT (32*1024) #define CHAN_SES_WINDOW_DEFAULT (64*CHAN_SES_PACKET_DEFAULT) - #define CHAN_TCP_PACKET_DEFAULT (32*1024) #define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT) - #define CHAN_X11_PACKET_DEFAULT (16*1024) #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT) - #define CHAN_HPN_MIN_WINDOW_DEFAULT (2*1024*1024) /* possible input states */ @@ -302,6 +299,7 @@ void chan_write_failed(Channel *); void chan_obuf_empty(Channel *); /* hpn handler */ -void channel_set_hpn(int, u_int); + +void channel_set_hpn(int, u_int); #endif Modified: user/attilio/vmcontention/crypto/openssh/kex.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/kex.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/kex.c Tue Feb 14 19:58:00 2012 (r231707) @@ -457,13 +457,13 @@ kex_choose_conf(Kex *kex) #ifdef NONE_CIPHER_ENABLED debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); if (strcmp(newkeys->enc.name, "none") == 0) { - debug("Requesting NONE. Authflag is %d", auth_flag); + debug("Requesting NONE. Authflag is %d", auth_flag); if (auth_flag == 1) debug("None requested post authentication."); else fatal("Pre-authentication none cipher requests " "are not allowed."); - } + } #endif debug("kex: %s %s %s %s", ctos ? "client->server" : "server->client", Modified: user/attilio/vmcontention/crypto/openssh/loginrec.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/loginrec.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/loginrec.c Tue Feb 14 19:58:00 2012 (r231707) @@ -146,7 +146,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> @@ -516,10 +515,6 @@ getlast_entry(struct logininfo *li) return (utmpx_get_entry(li)); #endif -#if 1 - return (utmpx_get_entry(li)); -#endif - #if defined(DISABLE_LASTLOG) /* On some systems we shouldn't even try to obtain last login * time, e.g. AIX */ Modified: user/attilio/vmcontention/crypto/openssh/readconf.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/readconf.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/readconf.c Tue Feb 14 19:58:00 2012 (r231707) @@ -264,6 +264,7 @@ static struct { { "noneswitch", oNoneSwitch }, #endif { "versionaddendum", oVersionAddendum }, + { NULL, oBadOption } }; @@ -1092,9 +1093,9 @@ parse_int: case oNoneEnabled: intptr = &options->none_enabled; goto parse_flag; - + /* - * We check to see if the command comes from the command line or not. + * We check to see if the command comes from the command line or not. * If it does then enable it otherwise fail. NONE must never be a * default configuration. */ @@ -1110,7 +1111,7 @@ parse_int: "from the command line", filename); error("Continuing..."); return 0; - } + } #endif case oVersionAddendum: @@ -1458,7 +1459,7 @@ fill_default_options(Options * options) /* options->host_key_alias should not be set by default */ /* options->preferred_authentications will be set in ssh */ if (options->hpn_disabled == -1) - options->hpn_disabled = 0; + options->hpn_disabled = 0; if (options->hpn_buffer_size > -1) { u_int maxlen; @@ -1478,7 +1479,7 @@ fill_default_options(Options * options) } if (options->tcp_rcv_buf == 0) options->tcp_rcv_buf = 1; - if (options->tcp_rcv_buf > -1) + if (options->tcp_rcv_buf > -1) options->tcp_rcv_buf *= 1024; if (options->tcp_rcv_buf_poll == -1) options->tcp_rcv_buf_poll = 1; Modified: user/attilio/vmcontention/crypto/openssh/readconf.h ============================================================================== --- user/attilio/vmcontention/crypto/openssh/readconf.h Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/readconf.h Tue Feb 14 19:58:00 2012 (r231707) @@ -133,6 +133,7 @@ typedef struct { int visual_host_key; int use_roaming; + int request_tty; int hpn_disabled; /* Switch to disable HPN buffer management. */ Modified: user/attilio/vmcontention/crypto/openssh/servconf.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/servconf.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/servconf.c Tue Feb 14 19:58:00 2012 (r231707) @@ -166,7 +166,7 @@ fill_default_server_options(ServerOption _PATH_HOST_KEY_FILE; if (options->protocol & SSH_PROTO_2) { options->host_key_files[options->num_host_key_files++] = - _PATH_HOST_RSA_KEY_FILE; + _PATH_HOST_RSA_KEY_FILE; options->host_key_files[options->num_host_key_files++] = _PATH_HOST_DSA_KEY_FILE; #ifdef OPENSSL_HAS_ECC @@ -286,7 +286,7 @@ fill_default_server_options(ServerOption options->ip_qos_interactive = IPTOS_LOWDELAY; if (options->ip_qos_bulk == -1) options->ip_qos_bulk = IPTOS_THROUGHPUT; - if (options->hpn_disabled == -1) + if (options->hpn_disabled == -1) options->hpn_disabled = 0; if (options->hpn_buffer_size == -1) { /* Modified: user/attilio/vmcontention/crypto/openssh/sftp.1 ============================================================================== --- user/attilio/vmcontention/crypto/openssh/sftp.1 Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/sftp.1 Tue Feb 14 19:58:00 2012 (r231707) @@ -246,7 +246,7 @@ diagnostic messages from Specify how many requests may be outstanding at any one time. Increasing this may slightly improve file transfer speed but will increase memory usage. -The default is 256 outstanding requests providing for 8MB +The default is 256 outstanding requests providing for 8MB of outstanding data with a 32KB buffer. .It Fl r Recursively copy entire directories when uploading and downloading. Modified: user/attilio/vmcontention/crypto/openssh/ssh.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/ssh.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/ssh.c Tue Feb 14 19:58:00 2012 (r231707) @@ -1461,6 +1461,7 @@ ssh_session2_open(void) c->dynamic_window = 1; debug("Enabled Dynamic Window Scaling\n"); } + debug3("ssh_session2_open: channel_new: %d", c->self); channel_send_open(c->self); Modified: user/attilio/vmcontention/crypto/openssh/sshd.c ============================================================================== --- user/attilio/vmcontention/crypto/openssh/sshd.c Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/sshd.c Tue Feb 14 19:58:00 2012 (r231707) @@ -1916,11 +1916,11 @@ main(int ac, char **av) #ifdef __FreeBSD__ /* * Initialize the resolver. This may not happen automatically - * before privsep chroot(). + * before privsep chroot(). */ if ((_res.options & RES_INIT) == 0) { - debug("res_init()"); - res_init(); + debug("res_init()"); + res_init(); } #ifdef GSSAPI /* Modified: user/attilio/vmcontention/crypto/openssh/sshd_config.5 ============================================================================== --- user/attilio/vmcontention/crypto/openssh/sshd_config.5 Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/sshd_config.5 Tue Feb 14 19:58:00 2012 (r231707) @@ -499,7 +499,7 @@ or .Pp .Pa /etc/hosts.equiv and -.Pa /etc/ssh/shosts.equiv +.Pa /etc/ssh/shosts.equiv are still used. The default is .Dq yes . Modified: user/attilio/vmcontention/crypto/openssh/version.h ============================================================================== --- user/attilio/vmcontention/crypto/openssh/version.h Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/crypto/openssh/version.h Tue Feb 14 19:58:00 2012 (r231707) @@ -2,11 +2,11 @@ /* $FreeBSD$ */ #ifndef SSH_VERSION -#define SSH_VERSION_BASE "OpenSSH_5.9p1" -#define SSH_VERSION_ADDENDUM "FreeBSD-20111001" +#define SSH_VERSION_BASE "OpenSSH_5.9p1" +#define SSH_VERSION_ADDENDUM "FreeBSD-20111001" #define SSH_VERSION_HPN "_hpn13v11" #define SSH_VERSION SSH_VERSION_BASE SSH_VERSION_HPN " " SSH_VERSION_ADDENDUM -#define SSH_RELEASE (ssh_version_get()) +#define SSH_RELEASE (ssh_version_get()) const char *ssh_version_get(void); void ssh_version_set_addendum(const char *); Modified: user/attilio/vmcontention/etc/defaults/rc.conf ============================================================================== --- user/attilio/vmcontention/etc/defaults/rc.conf Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/defaults/rc.conf Tue Feb 14 19:58:00 2012 (r231707) @@ -29,6 +29,8 @@ early_late_divider="FILESYSTEMS" # Scrip # stages of the boot process. Make sure you know # the ramifications if you change this. # See rc.conf(5) for more details. +always_force_depends="NO" # Set to check that indicated dependencies are + # running during boot (can increase boot time). swapfile="NO" # Set to name of swapfile if aux swapfile desired. apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). Modified: user/attilio/vmcontention/etc/devd/usb.conf ============================================================================== --- user/attilio/vmcontention/etc/devd/usb.conf Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/devd/usb.conf Tue Feb 14 19:58:00 2012 (r231707) @@ -157,7 +157,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0403"; - match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)"; + match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xa6d0|0xa6d0|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)"; action "kldload uftdi"; }; @@ -293,7 +293,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0411"; - match "product" "(0x0148|0x0150|0x015d|0x016f)"; + match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2)"; action "kldload if_run"; }; @@ -1021,7 +1021,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x05c6"; - match "product" "(0x6000|0x6613)"; + match "product" "(0x1000|0x6000|0x6613)"; action "kldload u3g"; }; @@ -1301,7 +1301,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0789"; - match "product" "(0x0162|0x0163|0x0164)"; + match "product" "(0x0162|0x0163|0x0164|0x0166)"; action "kldload if_run"; }; @@ -2093,7 +2093,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0b95"; - match "product" "(0x1720|0x1780|0x7720|0x772a|0x772b)"; + match "product" "(0x1720|0x1780|0x7720|0x772a|0x772b|0x7e2b)"; action "kldload if_axe"; }; @@ -4205,6 +4205,15 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "intclass" "0x02"; + match "intsubclass" "0x02"; + match "intprotocol" "0xff"; + action "kldload umodem"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "intclass" "0x03"; match "intsubclass" "0x01"; match "intprotocol" "0x01"; @@ -4327,5 +4336,5 @@ nomatch 32 { action "kldload umass"; }; -# 1645 USB entries processed +# 1652 USB entries processed Modified: user/attilio/vmcontention/etc/mtree/BSD.include.dist ============================================================================== --- user/attilio/vmcontention/etc/mtree/BSD.include.dist Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/mtree/BSD.include.dist Tue Feb 14 19:58:00 2012 (r231707) @@ -329,4 +329,6 @@ .. vm .. + xlocale + .. .. Modified: user/attilio/vmcontention/etc/rc.d/LOGIN ============================================================================== --- user/attilio/vmcontention/etc/rc.d/LOGIN Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/LOGIN Tue Feb 14 19:58:00 2012 (r231707) @@ -4,7 +4,7 @@ # # PROVIDE: LOGIN -# REQUIRE: DAEMON +# REQUIRE: DAEMON utx # This is a dummy dependency to ensure user services such as xdm, # inetd, cron and kerberos are started after everything else, in case Modified: user/attilio/vmcontention/etc/rc.d/Makefile ============================================================================== --- user/attilio/vmcontention/etc/rc.d/Makefile Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/Makefile Tue Feb 14 19:58:00 2012 (r231707) @@ -144,6 +144,7 @@ FILES= DAEMON \ tmp \ ${_ubthidhci} \ ugidfw \ + ${_utx} \ var \ virecover \ watchdogd \ @@ -177,6 +178,10 @@ _nscd= nscd _ubthidhci= ubthidhci .endif +.if ${MK_UTMPX} != "no" +_utx= utx +.endif + FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} Modified: user/attilio/vmcontention/etc/rc.d/SERVERS ============================================================================== --- user/attilio/vmcontention/etc/rc.d/SERVERS Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/SERVERS Tue Feb 14 19:58:00 2012 (r231707) @@ -4,7 +4,7 @@ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote abi ldconfig savecore +# REQUIRE: mountcritremote abi ldconfig savecore watchdogd # This is a dummy dependency, for early-start servers relying on # some basic configuration. Modified: user/attilio/vmcontention/etc/rc.d/addswap ============================================================================== --- user/attilio/vmcontention/etc/rc.d/addswap Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/addswap Tue Feb 14 19:58:00 2012 (r231707) @@ -6,7 +6,7 @@ # # PROVIDE: addswap -# REQUIRE: FILESYSTEMS +# REQUIRE: FILESYSTEMS kld # KEYWORD: nojail . /etc/rc.subr Modified: user/attilio/vmcontention/etc/rc.d/amd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/amd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/amd Tue Feb 14 19:58:00 2012 (r231707) @@ -19,15 +19,8 @@ extra_commands="reload" amd_precmd() { - if ! checkyesno nfs_client_enable; then - force_depend nfsclient || return 1 - fi - - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + force_depend nfsclient nfs_client || return 1 + force_depend rpcbind || return 1 case ${amd_map_program} in [Nn][Oo] | '') @@ -49,7 +42,6 @@ amd_precmd() command_args="> /var/run/amd.pid 2> /dev/null" ;; esac - return 0 } load_rc_config $name Modified: user/attilio/vmcontention/etc/rc.d/apmd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/apmd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/apmd Tue Feb 14 19:58:00 2012 (r231707) @@ -19,24 +19,18 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in i386) - # Enable apm if it is not already enabled - if ! checkyesno apm_enable && \ - ! /etc/rc.d/apm forcestatus 1>/dev/null 2>&1 - then - force_depend apm || return 1 - fi + force_depend apm || return 1 # Warn user about acpi apm compatibility support which # does not work with apmd. if [ ! -e /dev/apmctl ]; then - warn "/dev/apmctl not found; kernel is missing apm(4)" + warn "/dev/apmctl not found; kernel is missing apm(4)" fi ;; *) return 1 ;; esac - return 0 } load_rc_config $name Modified: user/attilio/vmcontention/etc/rc.d/cleanvar ============================================================================== --- user/attilio/vmcontention/etc/rc.d/cleanvar Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/cleanvar Tue Feb 14 19:58:00 2012 (r231707) @@ -58,8 +58,6 @@ cleanvar_start () { if [ -d /var/run -a ! -f /var/run/clean_var ]; then purgedir /var/run - # And an initial utmpx active session file - (cd /var/run && cp /dev/null utx.active && chmod 644 utx.active) >/var/run/clean_var fi if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then Modified: user/attilio/vmcontention/etc/rc.d/keyserv ============================================================================== --- user/attilio/vmcontention/etc/rc.d/keyserv Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/keyserv Tue Feb 14 19:58:00 2012 (r231707) @@ -19,13 +19,7 @@ start_precmd="keyserv_prestart" keyserv_prestart() { - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - - return 0 + force_depend rpcbind || return 1 } load_rc_config $name Modified: user/attilio/vmcontention/etc/rc.d/lockd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/lockd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/lockd Tue Feb 14 19:58:00 2012 (r231707) @@ -15,28 +15,16 @@ name="lockd" rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' -status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get # the correct flags from rc.conf(5). # lockd_precmd() { - local ret - ret=0 - - if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable - then - ret=1 - fi - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || ret=1 - fi + force_depend rpcbind || return 1 + force_depend statd rpc_statd || return 1 + rc_flags=${rpc_lockd_flags} - return ${ret} } load_rc_config $name Modified: user/attilio/vmcontention/etc/rc.d/mountd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/mountd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/mountd Tue Feb 14 19:58:00 2012 (r231707) @@ -19,11 +19,7 @@ extra_commands="reload" mountd_precmd() { - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + force_depend rpcbind || return 1 # mountd flags will differ depending on rc.conf settings # @@ -48,8 +44,8 @@ mountd_precmd() fi rm -f /var/db/mountdtab - ( umask 022 ; > /var/db/mountdtab ) - return 0 + ( umask 022 ; > /var/db/mountdtab ) || + err 1 'Cannot create /var/db/mountdtab' } load_rc_config $name Modified: user/attilio/vmcontention/etc/rc.d/nfsd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/nfsd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/nfsd Tue Feb 14 19:58:00 2012 (r231707) @@ -48,31 +48,15 @@ nfsd_precmd() if checkyesno nfsv4_server_enable; then sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null - if ! checkyesno nfsuserd_enable && \ - ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1 - then - if ! force_depend nfsuserd; then - err 1 "Cannot run nfsuserd" - fi - fi + force_depend nfsuserd || err 1 "Cannot run nfsuserd" else echo 'NFSv4 is disabled' sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null fi fi - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - - if ! checkyesno mountd_enable && \ - ! /etc/rc.d/mountd forcestatus 1>/dev/null 2>&1 - then - force_depend mountd || return 1 - fi - return 0 + force_depend rpcbind || return 1 + force_depend mountd || return 1 } run_rc_command "$1" Modified: user/attilio/vmcontention/etc/rc.d/statd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/statd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/statd Tue Feb 14 19:58:00 2012 (r231707) @@ -15,28 +15,15 @@ name="statd" rcvar=rpc_statd_enable command="/usr/sbin/rpc.${name}" start_precmd='statd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' -status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get # the correct flags from rc.conf(5). # statd_precmd() { - local ret - ret=0 - - if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable - then - ret=1 - fi - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || ret=1 - fi + force_depend rpcbind || return 1 + rc_flags=${rpc_statd_flags} - return ${ret} } load_rc_config $name Copied: user/attilio/vmcontention/etc/rc.d/utx (from r231706, head/etc/rc.d/utx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/etc/rc.d/utx Tue Feb 14 19:58:00 2012 (r231707, copy of r231706, head/etc/rc.d/utx) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: utx +# REQUIRE: DAEMON cleanvar +# KEYWORD: shutdown + +. /etc/rc.subr + +name="utx" +start_cmd="utx boot" +stop_cmd="utx shutdown" + +load_rc_config $name +run_rc_command "$1" Modified: user/attilio/vmcontention/etc/rc.d/var ============================================================================== --- user/attilio/vmcontention/etc/rc.d/var Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/var Tue Feb 14 19:58:00 2012 (r231707) @@ -28,7 +28,7 @@ # # PROVIDE: var -# REQUIRE: FILESYSTEMS kld +# REQUIRE: FILESYSTEMS kld addswap . /etc/rc.subr Modified: user/attilio/vmcontention/etc/rc.d/watchdogd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/watchdogd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/watchdogd Tue Feb 14 19:58:00 2012 (r231707) @@ -28,7 +28,7 @@ # # PROVIDE: watchdogd -# REQUIRE: DAEMON cleanvar +# REQUIRE: FILESYSTEMS cleanvar syslogd # KEYWORD: nojail shutdown . /etc/rc.subr Modified: user/attilio/vmcontention/etc/rc.d/ypbind ============================================================================== --- user/attilio/vmcontention/etc/rc.d/ypbind Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/ypbind Tue Feb 14 19:58:00 2012 (r231707) @@ -11,22 +11,20 @@ . /etc/rc.subr name="ypbind" -command="/usr/sbin/${name}" -start_precmd="ypbind_precmd" +rcvar="nis_client_enable" load_rc_config $name -rcvar="nis_client_enable" + +command="/usr/sbin/${name}" command_args="${nis_client_flags}" +start_precmd="ypbind_precmd" + ypbind_precmd() { local _domain - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + force_depend rpcbind || return 1 _domain=`domainname` if [ -z "$_domain" ]; then Modified: user/attilio/vmcontention/etc/rc.d/yppasswdd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/yppasswdd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/yppasswdd Tue Feb 14 19:58:00 2012 (r231707) @@ -11,27 +11,22 @@ . /etc/rc.subr name="yppasswdd" -command="/usr/sbin/rpc.${name}" -start_precmd="yppasswdd_precmd" +rcvar="nis_yppasswdd_enable" load_rc_config $name -rcvar="nis_yppasswdd_enable" + +command="/usr/sbin/rpc.${name}" command_args="${nis_yppasswdd_flags}" +start_precmd="yppasswdd_precmd" + yppasswdd_precmd() { local _domain - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - if ! checkyesno nis_server_enable && \ - ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 - then - force_depend ypserv || return 1 - fi + force_depend rpcbind || return 1 + force_depend ypserv nis_server || return 1 + _domain=`domainname` if [ -z "$_domain" ]; then warn "NIS domainname(1) is not set." Modified: user/attilio/vmcontention/etc/rc.d/ypserv ============================================================================== --- user/attilio/vmcontention/etc/rc.d/ypserv Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/ypserv Tue Feb 14 19:58:00 2012 (r231707) @@ -11,21 +11,20 @@ name="ypserv" rcvar="nis_server_enable" -command="/usr/sbin/${name}" -start_precmd="ypserv_prestart" load_rc_config $name + +command="/usr/sbin/${name}" command_args="${nis_server_flags}" +start_precmd="ypserv_prestart" + ypserv_prestart() { local _domain - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + force_depend rpcbind || return 1 + _domain=`domainname` if [ -z "$_domain" ]; then warn "NIS domainname(1) is not set." Modified: user/attilio/vmcontention/etc/rc.d/ypset ============================================================================== --- user/attilio/vmcontention/etc/rc.d/ypset Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/ypset Tue Feb 14 19:58:00 2012 (r231707) @@ -11,25 +11,20 @@ name="ypset" rcvar="nis_ypset_enable" -command="/usr/sbin/${name}" -start_precmd="ypset_precmd" + load_rc_config $name + +command="/usr/sbin/${name}" command_args="${nis_ypset_flags}" +start_precmd="ypset_precmd" + ypset_precmd() { local _domain - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - if ! checkyesno nis_client_enable && \ - ! /etc/rc.d/ypbind forcestatus 1>/dev/null 2>&1 - then - force_depend ypbind || return 1 - fi + force_depend rpcbind || return 1 + force_depend ypbind nis_client || return 1 _domain=`domainname` if [ -z "$_domain" ]; then Modified: user/attilio/vmcontention/etc/rc.d/ypupdated ============================================================================== --- user/attilio/vmcontention/etc/rc.d/ypupdated Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/ypupdated Tue Feb 14 19:58:00 2012 (r231707) @@ -11,6 +11,9 @@ name="ypupdated" rcvar="rpc_ypupdated_enable" + +load_rc_config $name + command="/usr/sbin/rpc.${name}" start_precmd="rpc_ypupdated_precmd" @@ -18,16 +21,8 @@ rpc_ypupdated_precmd() { local _domain - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - if ! checkyesno nis_server_enable && \ - ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 - then - force_depend ypserv || return 1 - fi + force_depend rpcbind || return 1 + force_depend ypserv nis_server || return 1 _domain=`domainname` if [ -z "$_domain" ]; then @@ -36,5 +31,4 @@ rpc_ypupdated_precmd() fi } -load_rc_config $name run_rc_command "$1" Modified: user/attilio/vmcontention/etc/rc.d/ypxfrd ============================================================================== --- user/attilio/vmcontention/etc/rc.d/ypxfrd Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.d/ypxfrd Tue Feb 14 19:58:00 2012 (r231707) @@ -11,25 +11,20 @@ name="ypxfrd" rcvar="nis_ypxfrd_enable" -command="/usr/sbin/rpc.${name}" -start_precmd="ypxfrd_precmd" + load_rc_config $name + +command="/usr/sbin/rpc.${name}" command_args="${nis_ypxfrd_flags}" +start_precmd="ypxfrd_precmd" + ypxfrd_precmd() { local _domain - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - if ! checkyesno nis_server_enable && \ - ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 - then - force_depend ypserv || return 1 - fi + force_depend rpcbind || return 1 + force_depend ypserv nis_server || return 1 _domain=`domainname` if [ -z "$_domain" ]; then Modified: user/attilio/vmcontention/etc/rc.subr ============================================================================== --- user/attilio/vmcontention/etc/rc.subr Tue Feb 14 19:50:41 2012 (r231706) +++ user/attilio/vmcontention/etc/rc.subr Tue Feb 14 19:58:00 2012 (r231707) @@ -71,22 +71,29 @@ set_rcvar_obsolete() } # -# force_depend script +# force_depend script [rcvar] # Force a service to start. Intended for use by services -# to resolve dependency issues. It is assumed the caller -# has check to make sure this call is necessary +# to resolve dependency issues. # $1 - filename of script, in /etc/rc.d, to run +# $2 - name of the script's rcvar (minus the _enable) # *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202141958.q1EJw1Yo015651>