/*
- * "$Id: usersys.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $"
*
* User, system, and password routines for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007-2008 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
#ifdef WIN32
# include <windows.h>
#endif /* WIN32 */
+#include "debug.h"
/*
* 'cupsEncryption()' - Get the default encryption settings.
*
* The default encryption setting comes from the CUPS_ENCRYPTION
- * environment variable, then the ~/.cupsrc file, and finally the
+ * environment variable, then the ~/.cups/client.conf file, and finally the
* /etc/cups/client.conf file. If not set, the default is
- * HTTP_ENCRYPT_IF_REQUESTED.
+ * @code HTTP_ENCRYPT_IF_REQUESTED@.
*/
http_encryption_t /* O - Encryption settings */
/*
* 'cupsGetPassword()' - Get a password from the user.
*
- * Uses the current password callback function. Returns NULL if the
+ * Uses the current password callback function. Returns @code NULL@ if the
* user does not provide a password.
*/
void
cupsSetEncryption(http_encryption_t e) /* I - New encryption preference */
{
- _cupsGlobals()->encryption = e;
+ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
+
+
+ cg->encryption = e;
+
+ if (cg->http)
+ httpEncryption(cg->http, e);
}
linenum = 0;
while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum) != NULL)
+ {
+ DEBUG_printf(("cupsServer: %d: %s %s\n", linenum, line,
+ value ? value : "(null)"));
+
if (!strcasecmp(line, "ServerName") && value)
{
/*
* Got it!
*/
+ DEBUG_puts("cupsServer: Got a ServerName line!");
server = value;
break;
}
+ }
cupsFileClose(fp);
}
* Copy the server name over and set the port number, if any...
*/
+ DEBUG_printf(("cupsServer: Using server \"%s\"...\n", server));
+
strlcpy(cg->server, server, sizeof(cg->server));
if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL &&
{
*port++ = '\0';
+ DEBUG_printf(("cupsServer: Using port %d...\n", atoi(port)));
ippSetPort(atoi(port));
}
/*
* 'cupsSetPasswordCB()' - Set the password callback for CUPS.
*
- * Pass NULL to restore the default (console) password callback.
+ * Pass @code NULL@ to restore the default (console) password callback.
*/
void
* 'cupsSetServer()' - Set the default server name.
*
* The "server" string can be a fully-qualified hostname, a numeric
- * IPv4 or IPv6 address, or a domain socket pathname. Pass NULL to
+ * IPv4 or IPv6 address, or a domain socket pathname. Pass @code NULL@ to
* restore the default server name.
*/
cg->server[0] = '\0';
cg->servername[0] = '\0';
}
+
+ if (cg->http)
+ {
+ httpClose(cg->http);
+ cg->http = NULL;
+ }
}
/*
* 'cupsSetUser()' - Set the default user name.
*
- * Pass NULL to restore the default user name.
+ * Pass @code NULL@ to restore the default user name.
*/
void
snprintf(filename, sizeof(filename), "%s/.cups/client.conf", home);
if ((fp = cupsFileOpen(filename, "r")) != NULL)
+ {
+ DEBUG_printf(("cups_open_client_conf: Using \"%s\"...\n", filename));
return (fp);
+ }
snprintf(filename, sizeof(filename), "%s/.cupsrc", home);
if ((fp = cupsFileOpen(filename, "r")) != NULL)
+ {
+ DEBUG_printf(("cups_open_client_conf: Using \"%s\"...\n", filename));
return (fp);
+ }
}
snprintf(filename, sizeof(filename), "%s/client.conf", cg->cups_serverroot);
/*
- * End of "$Id: usersys.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $".
*/