/*
- * $Id: queries.c,v 1.13 2002-02-15 16:15:21 morgana Exp $
+ * $Id: queries.c,v 1.17 2003-05-14 15:13:50 didg Exp $
*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
if (( rc = krb_rd_req( &tkt, "LaserWriter", printer->p_name,
0, &ad, "" )) != RD_AP_OK ) {
- LOG(log_error, logtype_default, "cq_k4login: %s", krb_err_txt[ rc ] );
+ LOG(log_error, logtype_papd, "cq_k4login: %s", krb_err_txt[ rc ] );
append( out, LoginFailed, strlen( LoginFailed ));
compop();
CONSUME( in, linelength + crlflength );
return( CH_DONE );
}
- LOG(log_info, logtype_default, "cq_k4login: %s.%s@%s", ad.pname, ad.pinst,
+ LOG(log_info, logtype_papd, "cq_k4login: %s.%s@%s", ad.pname, ad.pinst,
ad.prealm );
lp_person( ad.pname );
lp_host( ad.prealm );
if ( comgetflags() == 0 ) { /* start */
if (( printer->p_flags & P_KRB ) == 0 ) { /* no kerberos */
if ( comswitch( queries, cq_default ) < 0 ) {
- LOG(log_error, logtype_default, "cq_uameth: can't find default!" );
+ LOG(log_error, logtype_papd, "cq_uameth: can't find default!" );
exit( 1 );
}
return( CH_DONE );
* Handler for RBISpoolerID
*/
-static const char *spoolerid = "(PAPD Spooler) VERSION\n";
+static const char *spoolerid = "(PAPD Spooler) 1.0 (" VERSION ")\n";
int gq_rbispoolerid( out )
struct papfile *out;
if ( gq->gq_name == NULL || gq->gq_handler == NULL ||
(gq->gq_handler)( out ) < 0 ) {
if ( comswitch( queries, cq_default ) < 0 ) {
- LOG(log_error, logtype_default, "cq_feature: can't find default!" );
+ LOG(log_error, logtype_papd, "cq_feature: can't find default!" );
exit( 1 );
}
return( CH_DONE );
if (( pfe = ppd_feature( p, stop - p )) == NULL ) {
if ( comswitch( queries, cq_default ) < 0 ) {
- LOG(log_error, logtype_default, "cq_feature: can't find default!" );
+ LOG(log_error, logtype_papd, "cq_feature: can't find default!" );
exit( 1 );
}
return( CH_DONE );
if (( pdpsver = ppd_feature( psver, strlen( psver ))) == NULL ) {
if ( comswitch( queries, cq_default ) < 0 ) {
- LOG(log_error, logtype_default, "cq_printer: can't find default!" );
+ LOG(log_error, logtype_papd, "cq_printer: can't find default!" );
exit( 1 );
}
return( CH_DONE );
}
}
if ( *p == '\0' ) {
- LOG(log_error, logtype_default, "cq_printer: can't parse PSVersion!" );
+ LOG(log_error, logtype_papd, "cq_printer: can't parse PSVersion!" );
if ( comswitch( queries, cq_default ) < 0 ) {
- LOG(log_error, logtype_default, "cq_printer: can't find default!" );
+ LOG(log_error, logtype_papd, "cq_printer: can't find default!" );
exit( 1 );
}
return( CH_DONE );
if (( pdprod = ppd_feature( prod, strlen( prod ))) == NULL ) {
if ( comswitch( queries, cq_default ) < 0 ) {
- LOG(log_error, logtype_default, "cq_printer: can't find default!" );
+ LOG(log_error, logtype_papd, "cq_printer: can't find default!" );
exit( 1 );
}
return( CH_DONE );
}
if ( lp_queue( out )) {
- LOG(log_error, logtype_default, "cq_listq: lp_queue failed" );
+ LOG(log_error, logtype_papd, "cq_listq: lp_queue failed" );
}
compop();
{
char *start, *stop, *p, *begin;
int linelength, crlflength;
- char username[9] = "\0";
+ char username[UAM_USERNAMELEN + 1] = "\0";
struct papd_comment *comment = compeek();
char uamtype[20] = "\0";
if ((papd_uam = auth_uamfind(UAM_SERVER_PRINTAUTH,
uamtype, strlen(uamtype))) == NULL) {
- LOG(log_info, logtype_default, "Could not find uam: %s", uamtype);
+ LOG(log_info, logtype_papd, "Could not find uam: %s", uamtype);
append(out, rbiloginbad, strlen(rbiloginbad));
append(out, rbiloginerrstr, strlen(rbiloginerrstr));
} else {
if ( (papd_uam->u.uam_printer(p,stop,username,out)) == 0 ) {
lp_person( username );
+ append(out, rbiloginok, strlen( rbiloginok ));
+ LOG(log_info, logtype_papd, "RBILogin: Logged in '%s'", username);
} else {
append(out, rbiloginbad, strlen( rbiloginbad));
append(out, rbiloginerrstr, strlen(rbiloginerrstr));