===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -c -r1.85 -r1.86
*** src/usr.bin/nc/netcat.c	2006/01/20 00:01:20	1.85
--- src/usr.bin/nc/netcat.c	2006/01/25 23:21:37	1.86
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.85 2006/01/20 00:01:20 millert Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   *
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.86 2006/01/25 23:21:37 djm Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   *
***************
*** 70,75 ****
--- 70,76 ----
  int	kflag;					/* More than one connect */
  int	lflag;					/* Bind to local port */
  int	nflag;					/* Don't do name look up */
+ char   *Pflag;					/* Proxy username */
  char   *pflag;					/* Localport flag */
  int	rflag;					/* Random ports flag */
  char   *sflag;					/* Source Address */
***************
*** 92,99 ****
  int	local_listen(char *, char *, struct addrinfo);
  void	readwrite(int);
  int	remote_connect(const char *, const char *, struct addrinfo);
! int	socks_connect(const char *, const char *, struct addrinfo, const char *, const char *,
! 	struct addrinfo, int);
  int	udptest(int);
  int	unix_connect(char *);
  int	unix_listen(char *);
--- 93,100 ----
  int	local_listen(char *, char *, struct addrinfo);
  void	readwrite(int);
  int	remote_connect(const char *, const char *, struct addrinfo);
! int	socks_connect(const char *, const char *, struct addrinfo,
! 	    const char *, const char *, struct addrinfo, int, const char *);
  int	udptest(int);
  int	unix_connect(char *);
  int	unix_listen(char *);
***************
*** 123,129 ****
  	sv = NULL;
  
  	while ((ch = getopt(argc, argv,
! 	    "46Ddhi:jklnp:rSs:tT:Uuvw:X:x:z")) != -1) {
  		switch (ch) {
  		case '4':
  			family = AF_INET;
--- 124,130 ----
  	sv = NULL;
  
  	while ((ch = getopt(argc, argv,
! 	    "46Ddhi:jklnP:p:rSs:tT:Uuvw:X:x:z")) != -1) {
  		switch (ch) {
  		case '4':
  			family = AF_INET;
***************
*** 167,172 ****
--- 168,176 ----
  		case 'n':
  			nflag = 1;
  			break;
+ 		case 'P':
+ 			Pflag = optarg;
+ 			break;
  		case 'p':
  			pflag = optarg;
  			break;
***************
*** 354,360 ****
  
  			if (xflag)
  				s = socks_connect(host, portlist[i], hints,
! 				    proxyhost, proxyport, proxyhints, socksv);
  			else
  				s = remote_connect(host, portlist[i], hints);
  
--- 358,365 ----
  
  			if (xflag)
  				s = socks_connect(host, portlist[i], hints,
! 				    proxyhost, proxyport, proxyhints, socksv,
! 				    Pflag);
  			else
  				s = remote_connect(host, portlist[i], hints);
  
***************
*** 818,823 ****
--- 823,829 ----
  	\t-k		Keep inbound sockets open for multiple connects\n\
  	\t-l		Listen mode, for inbound connects\n\
  	\t-n		Suppress name/port resolutions\n\
+ 	\t-P proxyuser\tUsername for proxy authentication\n\
  	\t-p port\t	Specify local port for remote connects\n\
  	\t-r		Randomize remote ports\n\
  	\t-S		Enable the TCP MD5 signature option\n\