CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/21 00:46:03 Modified files: share/man/man4 : Makefile Log message: zap mlinks for advansys(4), pnp(4), and networking(4), all of which are aliases rather than actual things; ok schwarze
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/21 00:48:10 Modified files: lib/libc/net : getifaddrs.3 if_indextoname.3 Log message: point to netintro(4) rather than (now removed) networking(4);
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: feine...@cvs.openbsd.org2015/11/21 00:46:22 Modified files: sys/sys: videoio.h Log message: Add V4L2_FMT_FLAG_EMULATED
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 22:29:42 Modified files: games/worm : worm.c games/worms: worms.c Log message: pledge the wyrms
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: v...@cvs.openbsd.org2015/11/20 22:11:32 Modified files: sys/arch/octeon/dev: if_cnmac.c Log message: Drop sysctl leftovers.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 20:20:30 Modified files: games/monop: monop.c Log message: pledge "stdio rpath wpath cpath" from Ricardo Mestre
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 19:37:36 Modified files: distrib/sets/lists/base: mi distrib/sets/lists/comp: mi distrib/sets/lists/man: mi Log message: sync
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: k...@cvs.openbsd.org2015/11/20 19:12:09 Modified files: sbin/fdisk : cmd.c Log message: Nuke long standing annoyance of EDIT() macros and switch both Xedit() and Xgedit() to a new mechanism. Keep a copy of the old partition and compare final edited version to that to decide if it is dirty. Fixes a number of (but not all!) nits in editing partitions. Original problem(s) noted by, suggestions from, much testing and ok tim@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2015/11/20 18:08:50 Modified files: sys/net: hfsc.c if.c if_var.h Log message: simplify ifq_deq_rollback by only having it unlock. hfsc needed a rollback ifqop to requeue the mbuf because it used ml_dequeue in the begin op. now it uses MBUF_LIST_FIRST to get a ref to the first mbuf in deq_begin. now the disciplines dont need a rollback op, so ifq_deq_rollback can be simplified to just releasing the mutex. based on a discussion with kenjiro cho
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2015/11/20 17:59:25 Modified files: sys/arch/sgi/hpc: if_sq.c Log message: error: too many arguments to function 'ifq_deq_begin' found by deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2015/11/20 17:32:46 Modified files: share/man/man9 : Makefile ml_init.9 sys/sys: mbuf.h Log message: provide MBUF_LIST_FIRST and MBUF_LIST_NEXT for iterating over an mbuf_list. MBUF_LIST_FOREACH is then rewritten on top of those. this makes it easier to get at the head of a list too, which may make the hfsc ifq backend nicer. based on a discussion with kenjiro cho ok mpi@
Re: CVS: cvs.openbsd.org: src
On Fri, Nov 20, 2015 at 04:26:08PM -0700, Florian Obser wrote: > CVSROOT: /cvs > Module name: src > Changes by: flor...@cvs.openbsd.org 2015/11/20 16:26:08 > > Modified files: > usr.sbin/bgpd : bgpd.c session.c > > Log message: > bgpd has been naughty. It tries to play with AF_UNIX sockets without > pledging "unix". > Move control_listen up to the main process which already has > pledge("unix"). accept(2) was already allowed. > > (Technically no longer necessary since listen(2) is now allowed, too, > but this moves it to the right place.) > > OK claudio@, deraadt@ > and OK sthen@ -- I'm not entirely sure you are real.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: mill...@cvs.openbsd.org 2015/11/20 16:40:32 Modified files: include: string.h strings.h Log message: POSIX says that ffs(), strcasecmp(), strncasecmp(), r?index() and the b* byte functions belong in strings.h, not string.h so break them out of string.h into a new strings.h. As long as there is no POSIX or X/OPEN define in use string.h will pull in strings.h. OK naddy@ deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: flor...@cvs.openbsd.org 2015/11/20 16:26:08 Modified files: usr.sbin/bgpd : bgpd.c session.c Log message: bgpd has been naughty. It tries to play with AF_UNIX sockets without pledging "unix". Move control_listen up to the main process which already has pledge("unix"). accept(2) was already allowed. (Technically no longer necessary since listen(2) is now allowed, too, but this moves it to the right place.) OK claudio@, deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 16:16:01 Modified files: sys/kern : uipc_syscalls.c Log message: Neuter the pledge domain checking for listen, getpeername, and getsockname also. The idea is much like rpath is with files, you get an fd and then you can play with it somewhat. In the socket space once you have a fd, you can play with it somewhat. So you cannot bind, but you can accept. You can listen, getpeername, getsockname, and of course set/getsockopt is somewhat available.. yes, this makes pledge the anti-capsicum, kind of like salt from Secovlje.. reasoning due to a conversation with tedu
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: ha...@cvs.openbsd.org 2015/11/20 16:04:01 Modified files: usr.bin/ssh: ssh-keygen.c Log message: allow comment change for all supported formats ok djm@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: n...@cvs.openbsd.org2015/11/20 15:02:54 Modified files: usr.bin/tmux : cmd-if-shell.c cmd-new-window.c utf8.c Log message: Memory leaks and an uninitialized part of utf8_data, from Patrick Palka.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: schwa...@cvs.openbsd.org2015/11/20 14:58:32 Modified files: usr.bin/mandoc : main.c tag.c tag.h Log message: Fix multiple issues regarding process group and signal mask handling found by tb@ and millert@; parts of the code, in particular in tag.c, by millert@; OK millert@.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 14:52:50 Modified files: distrib/sets/lists/comp: mi Log message: sync
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 14:05:52 Modified files: lib/libc/uuid : uuid.3 Log message: Document that the status argument may be NULL; OK millert@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 13:59:52 Modified files: sys/kern : kern_pledge.c Log message: Permit msync(2) in the "stdio" set; only a few programs use it related to mmap, but thinking about it nothing feels risky Long discussions with florian
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 13:57:48 Modified files: usr.bin/skeyinit: skeyinit.c Log message: pledge "stdio rpath wpath cpath fattr flock tty" ok millert
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: mill...@cvs.openbsd.org 2015/11/20 13:37:43 Modified files: libexec: Makefile Removed files: libexec/login_tis: Makefile login_tis.8 login_tis.c login_tis.h Log message: Remove login_tis, no one should be using the TIS authentication server these days.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 13:13:32 Modified files: bin/ed : ed.1 Log message: honestly i think you should just zap that paragraph - it doesn;t make sense to document that posix more or less says something should happen, and that it does. jmc
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 12:05:02 Modified files: share/man/man9 : Makefile Log message: cleanup powerhooks links too
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 11:54:49 Modified files: usr.bin/lex: buf.c ecs.c Log message: ansi
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 11:57:18 Modified files: usr.bin/lex: Makefile Log message: switch back to yaccing parse.y, it seems to work.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 11:53:42 Modified files: usr.sbin/ntpd : Makefile control.c Log message: use RMS for jitter. we're linking with enough libraries that libm is tiny. ok deraadt
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 11:43:25 Modified files: share/man/man8 : afterboot.8 Log message: Don't specify full paths for doas and path, and don't suggest that users do so. "good" deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 11:35:09 Modified files: distrib/sets/lists/comp: mi Log message: sync
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 11:10:37 Modified files: lib/libc/termios: tcsetpgrp.3 Log message: typo tcgetpgrp -> tcsetpgrp ok mmcc@, yes... deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 10:48:33 Modified files: share/man/man9 : Makefile Removed files: share/man/man9 : dopowerhooks.9 powerhook_establish.9 Log message: After being separated for more than 5 years, allow these poor manuals to meet their code again... in the bit bucket!
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 10:49:59 Modified files: usr.sbin/rpc.bootparamd: bootparamd.c Log message: KNF
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 10:37:08 Modified files: sbin/growfs: growfs.c Log message: De-justify more comments. From FreeBSD.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 10:31:20 Modified files: sbin/growfs: growfs.c Log message: Monospace comments are not meant to be justified. From FreeBSD.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/20 10:26:56 Modified files: sbin/route : route.c Log message: Replace hardcoded "0" with SHUT_RD; from Ricardo Mestre
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 09:58:37 Modified files: games/atc : main.c Log message: Convert hand-rolled option parsing to getopt(3). ok deraadt@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 09:31:05 Modified files: lib/libkeynote : keynote.1 keynote.3 keynote.4 keynote.5 Log message: No longer direct bug reports to keyn...@research.att.com - it bounces mail. "fair enough" jmc@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: n...@cvs.openbsd.org2015/11/20 09:33:46 Modified files: usr.bin/tmux : alerts.c Log message: The alerts callback should be fired for bells even if bell-action is none because it also affects the status line bell indicator (and bell-action does not). Fixes a problem reported by tim@.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 09:25:15 Modified files: usr.bin/less : screen.c Log message: wrapping an ioctl for TIOCGWINSZ inside #ifdef TIOCGWINSIZE (entirely different) makes no sense; instead, accept all modern systems have TIOCGWINSZ.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 09:22:33 Modified files: usr.bin/less : main.c Log message: spaces
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 09:16:59 Modified files: usr.bin/openssl: certhash.c Log message: do not need sys/param.h
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 09:06:54 Modified files: sys/dev: diskmap.c sys/sys: pledge.h sys/kern : kern_pledge.c Log message: Add pledge "disklabel", which allows sysctl kern.rawpartition, a few disklabel ioctls, and the DIOCMAP ioctl against /dev/diskmap used to translate duid numbers into partitions. This will allow pledging of at least 12 disk/filesystem aware programs; due to the negative impact that diff will wait a bit so everyone has a chance to update their kernels. ok semarie
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 08:57:39 Modified files: bin/stty : key.c Log message: KNF
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 08:58:29 Modified files: bin/stty : stty.c Log message: Cannot pledge bottom half of setting, because of the ioctl backing "extproc", "ostart" and "ostop" are not allowed (yet?)
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 08:52:57 Modified files: usr.sbin/trpt : trpt.c Log message: Appears to only need pledge "stdio" against open kvm
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: dera...@cvs.openbsd.org 2015/11/20 08:51:26 Modified files: share/man/man8 : afterboot.8 Log message: ntpd ison by default; from rob pierce
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: v...@cvs.openbsd.org2015/11/20 08:16:06 Modified files: sys/arch/octeon/dev: if_cnmac.c Log message: Make cnmac compile again after IF_DROP() removal. Just bail out if the link is down. ok mpi@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: st...@cvs.openbsd.org 2015/11/20 07:41:48 Modified files: distrib/miniroot: install.sub Log message: don't auto-skip X sets on systems without wscons, you can remove them easily with -x*, and "no wscons" doesn't cover all of the systems where one might intentionally want to skip them anyway. ok bmercer deraadt espie rpe
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 07:32:33 Modified files: sys/dev/pci: if_em.h Log message: Missed in previous, pointed by benoit@
Re: CVS: cvs.openbsd.org: src
On 20/11/15(Fri) 06:11, Martin Pieuchot wrote: > CVSROOT: /cvs > Module name: src > Changes by: m...@cvs.openbsd.org2015/11/20 06:11:16 > > Modified files: > sys/dev/pci: if_em.c > > Log message: > Revert all the changes to run the tx completion path wihtout holding the > KERNE_LOCK. > > A piece is still not right as many peole reported a "watchdog timeout" > problem. > > This basically brings us back to r1.305. > > ok dlg@, jmatthew@ and ok mikeb@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/20 06:12:14 Modified files: sys/net: route.c Log message: Initialise the ifidx to 0 (no interface) in rtredirect() to avoid using ifidx uninitialised for the gateway not directly reachable case. ok mpi@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 06:11:16 Modified files: sys/dev/pci: if_em.c Log message: Revert all the changes to run the tx completion path wihtout holding the KERNE_LOCK. A piece is still not right as many peole reported a "watchdog timeout" problem. This basically brings us back to r1.305. ok dlg@, jmatthew@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/20 05:43:37 Modified files: usr.bin/telnet : commands.c Log message: Replace hardcoded "2" with SHUT_RDWR; from Ricardo Mestre
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 05:41:29 Modified files: sys/dev/ic : rt2560.c rt2661.c Log message: Check for space on the ring before dequeuing packets. Allows us to get rid of mq_requeue(9) and IFQ_POLL(9) because wireless drivers use a special queue for management frames. Tested by stsp@, ok dlg@, stsp@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 05:27:42 Modified files: sys/net: if.c if.h Log message: Keep if_ref() private, if_get() is what you want to use before if_put(). The thread detaching an interface will sleep until all references to this interface have been released. So we decided to only keep references for a short period of time. Keeping if_ref() private will hopefully help preserve this goal as long as it makes sense. Calling if_get()/if_put() in the same function also allows us to make use of static analysis tools (thanks jsg@!) to catch our errors. ok dlg@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 05:20:30 Modified files: sys/net: if_tun.c Log message: Prefer if_get() over if_ref() when checking if the interface has been destroyed during our sleep. No objection from the slackers.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/20 05:17:00 Modified files: gnu/usr.bin/cvs: configure Log message: Regen.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/20 05:16:42 Modified files: gnu/usr.bin/cvs: acconfig.h configure.in Log message: Server-side pserver support is broken, and we don't plan to support it. ok sthen@ semarie@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2015/11/20 05:14:35 Modified files: gnu/usr.bin/texinfo/info: terminal.c Log message: Unbreak, tcflow and its underlying ioctls aren't allowed by pledge(2). Just delete the tcflow(3) calls, the use case for tcflow(3) here is a bit far-fetched. looks good to deraadt@, ok espie@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: st...@cvs.openbsd.org 2015/11/20 05:05:34 Modified files: sys/net: if_spppsubr.c if_pppoe.c Log message: sppp(4) is now only used for pppoe(4) which doesn't use framing, so remove support for sppp with framing, simplifying things. Remove unused ifdefs while there. "sppp will go away before it gets used for something else" dlg@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: n...@cvs.openbsd.org2015/11/20 05:01:19 Modified files: usr.bin/tmux : cmd-set-option.c cmd-show-options.c options-table.c status.c tmux.c tmux.h Log message: Instead of separate tables for different types of options, give each option a scope type (server, session, window) in one table.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2015/11/20 04:53:36 Modified files: sys/net: if_spppsubr.c Log message: avoid a use after enqueue, which is like a use after free. once you enqueue an mbuf, you no longer own it. therefore you cant read the length out of it. this reads the length first, then tries to enq it. also, call if_start instead of a bare call to the underlying start routine. ok mpi@ sthen@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: d...@cvs.openbsd.org2015/11/20 04:15:07 Modified files: share/man/man9 : Makefile sys/net: if.c if_var.h Added files: share/man/man9 : ifq_enqueue.9 Removed files: share/man/man9 : ifq_enq.9 Log message: i made a mistake. rename ifq_enq and ifq_deq to ifq_enqueue and ifq_dequeue fixing it now before i regret it more.
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 03:51:30 Modified files: sys/netinet: if_ether.c Log message: This no longer depends on bridge.h, fewer "#ifdef NBRIDGE", say yeah!
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 03:50:08 Modified files: sys/netinet: if_ether.c Log message: Fewer uses of rt_ifp. Tested by and ok sthen@,
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 03:45:29 Modified files: sys/netinet: tcp_input.c Log message: Make use if_get() and get rid of rt_ifp. Tested by and ok sthen@, ok visa@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: m...@cvs.openbsd.org2015/11/20 03:42:51 Modified files: sys/net: pf.c Log message: Make use if_get() and get rid of rt_ifp. While here keep carp(4) bits under NCARP. Tested by and ok sthen@, ok visa@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: st...@cvs.openbsd.org 2015/11/20 03:40:00 Modified files: sys/net: if.c Log message: fix prio KASSERT, it should be <= not <. ok dlg@
CVS: cvs.openbsd.org: www
CVSROOT:/cvs Module name:www Changes by: flor...@cvs.openbsd.org 2015/11/20 02:32:13 Modified files: . : events.html Log message: link to video for phessler's talk
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 02:29:53 Modified files: bin/ksh: sh.h Log message: remove unused prototype ok mmcc@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 02:04:01 Modified files: usr.sbin/slowcgi: slowcgi.c Log message: typo in error message: to -> too ok florian@
CVS: cvs.openbsd.org: src
CVSROOT:/cvs Module name:src Changes by: t...@cvs.openbsd.org2015/11/20 01:53:28 Modified files: bin/ed : ed.1 main.c Log message: make ed restore the user defined prompt (specified with -p) when it was turned off and then on again with 'P'. ok daniel@