head	1.2;
access;
symbols
	pkgsrc-2021Q1:1.1.0.82
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.80
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.78
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.74
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.54
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.76
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.72
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.70
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.68
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.66
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.64
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.62
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.60
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.58
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.56
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.52
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.50
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.48
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.46
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.44
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.42
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.40
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.38
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.36
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.34
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.32
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.30
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.28
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.26
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.24
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.22
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.20
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.18
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.16
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.14
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.12
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.10
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2021.04.13.15.15.46;	author nia;	state dead;
branches;
next	1.1;
commitid	2AJ7UMqOvShZ09PC;

1.1
date	2011.04.01.21.56.14;	author agc;	state Exp;
branches;
next	;


desc
@@


1.2
log
@remove security/srp_client

development appears stalled upstream and this does not support current
openssl or SSP.
@
text
@$NetBSD: patch-az,v 1.1 2011/04/01 21:56:14 agc Exp $

--- ftp/ftpd/ftpcmd.c	2011/03/30 11:35:57	1.1
+++ ftp/ftpd/ftpcmd.c	2011/03/30 11:36:46
@@@@ -1985,10 +1985,10 @@@@
 #include <arpa/telnet.h>
 
 /*
- * getline - a hacked up version of fgets to ignore TELNET escape codes.
+ * srp_ftp_getline - a hacked up version of fgets to ignore TELNET escape codes.
  */
 char *
-getline(s, n, iop)
+srp_ftp_getline(s, n, iop)
 	char *s;
 	register FILE *iop;
 {
@@@@ -2089,7 +2089,7 @@@@
 		*s = '\0';
 		return(s);
 	    }
-	    if (debug) syslog(LOG_DEBUG, "getline got %d from %s <%s>\n", 
+	    if (debug) syslog(LOG_DEBUG, "srp_ftp_getline got %d from %s <%s>\n", 
 			      len, cs, mic?"MIC":"ENC");
 #ifdef SRP
 	if (strcmp(auth_type, "SRP") == 0)
@@@@ -2218,13 +2218,13 @@@@
 		case CMD:
 			(void) signal(SIGALRM, toolong);
 			(void) alarm((unsigned) timeout);
-			if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+			if (srp_ftp_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
 				reply(221, "You could at least say goodbye.");
 				dologout(0);
 			}
 			(void) alarm(0);
 
-			/* If getline() finds an error, the string is null */
+			/* If srp_ftp_getline() finds an error, the string is null */
 			if (*cbuf == '\0')
 				continue;
 
@


1.1
log
@Let this package build on post-POSIX getline() systems.

Also include the relevant (static) libraries, where necessary, to allow
link-editing.
@
text
@d1 1
a1 1
$NetBSD$
@