Module Name: src
Committed By: christos
Date: Sat Dec 22 16:58:51 UTC 2012
Modified Files:
src/usr.bin/ftp: fetch.c
Log Message:
compile without SSL
To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 src/usr.bin/ftp/fetch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.200 src/usr.bin/ftp/fetch.c:1.201
--- src/usr.bin/ftp/fetch.c:1.200 Sat Dec 22 11:57:09 2012
+++ src/usr.bin/ftp/fetch.c Sat Dec 22 11:58:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.200 2012/12/22 16:57:09 christos Exp $ */
+/* $NetBSD: fetch.c,v 1.201 2012/12/22 16:58:51 christos Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.200 2012/12/22 16:57:09 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.201 2012/12/22 16:58:51 christos Exp $");
#endif /* not lint */
/*
@@ -625,8 +625,10 @@ fetch_url(const char *url, const char *p
int hasleading;
if (proxyenv == NULL) {
+#ifdef WITH_SSL
if (urltype == HTTPS_URL_T)
proxyenv = getoptionvalue("https_proxy");
+#endif
if (proxyenv == NULL && IS_HTTP_TYPE(urltype))
proxyenv = getoptionvalue("http_proxy");
else if (urltype == FTP_URL_T)
