/*
- * $Id: queries.c,v 1.8 2001-07-31 19:50:14 srittau Exp $
+ * $Id: queries.c,v 1.15 2002-09-29 23:29:14 sibaz Exp $
*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <sys/syslog.h>
+#include <atalk/logger.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
if (( rc = krb_rd_req( &tkt, "LaserWriter", printer->p_name,
0, &ad, "" )) != RD_AP_OK ) {
- syslog( LOG_ERR, "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 );
}
- syslog( LOG_INFO, "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 ) {
- syslog( LOG_ERR, "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) 2.1 (2.1.4 pre-release)\n";
+static const char *spoolerid = "(PAPD Spooler) " VERSION "\n";
int gq_rbispoolerid( out )
struct papfile *out;
#endif /* notdef */
{ "RBISpoolerID", gq_rbispoolerid },
{ "RBIUAMListQuery", gq_rbiuamlist },
+ { "ADOIsBinaryOK?", gq_true },
{ "UMICHListQueue", gq_true },
{ "UMICHDeleteJob", gq_true },
{ NULL },
if ( gq->gq_name == NULL || gq->gq_handler == NULL ||
(gq->gq_handler)( out ) < 0 ) {
if ( comswitch( queries, cq_default ) < 0 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "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' ) {
- syslog( LOG_ERR, "cq_printer: can't parse PSVersion!" );
+ LOG(log_error, logtype_papd, "cq_printer: can't parse PSVersion!" );
if ( comswitch( queries, cq_default ) < 0 ) {
- syslog( LOG_ERR, "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 ) {
- syslog( LOG_ERR, "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 )) {
- syslog( LOG_ERR, "cq_listq: lp_queue failed" );
+ LOG(log_error, logtype_papd, "cq_listq: lp_queue failed" );
}
compop();
static const char *rbiloginbad = "-1\r";
static const char *rbiloginerrstr = "%%[Error: SecurityError; \
SecurityViolation: Unknown user, incorrect password or log on is \
-disabled ]%%\r%%Flushing: rest of job (to end-of-file) will be \
+disabled ]%%\r%%[Flushing: rest of job (to end-of-file) will be \
ignored ]%%\r";
int cq_rbilogin( in, out )
if ((papd_uam = auth_uamfind(UAM_SERVER_PRINTAUTH,
uamtype, strlen(uamtype))) == NULL) {
- syslog(LOG_INFO, "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 {