changed all LOG messages using logtype_default to use logtype_papd

diff --git a/etc/papd/auth.c b/etc/papd/auth.c
index 37cc5c6c53a8101efdf9cbdc633313f2e6acff2c..124a083fed8c4085d8ba315644745996abfc57ef 100644 (file)
--- a/etc/papd/auth.c
+++ b/etc/papd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.5 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: auth.c,v 1.6 2002-09-29 23:29:13 sibaz Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -118,7 +118,7 @@ int auth_load(const char *path, const char *list)
     strncpy(name + len, p, sizeof(name) - len);
     if ((stat(name, &st) == 0) && (mod = uam_load(name, p))) {
       uam_attach(&uam_modules, mod);
-      LOG(log_info, logtype_default, "uam: %s loaded", p);
+      LOG(log_info, logtype_papd, "uam: %s loaded", p);
     }
     p = strtok(NULL, ",");
   }

diff --git a/etc/papd/comment.c b/etc/papd/comment.c
index 5038d7a21f66b535e7afb17c563e5135ff50cc48..e8bb270e67be129dfe0e021615627b0a1a26ddf5 100644 (file)
--- a/etc/papd/comment.c
+++ b/etc/papd/comment.c
@@ -1,5 +1,5 @@
 /*
- * $Id: comment.c,v 1.7 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: comment.c,v 1.8 2002-09-29 23:29:13 sibaz Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -37,7 +37,7 @@ void compush( comment )
 
     if (( cs = (struct comstate *)malloc( sizeof( struct comstate ))) ==
            NULL ) {
-       LOG(log_error, logtype_default, "malloc: %m" );
+       LOG(log_error, logtype_papd, "malloc: %m" );
        exit( 1 );
     }
 
@@ -59,7 +59,7 @@ int comswitch( comments, handler )
        }
     }
     if ( comment == NULL || comment->c_handler != handler ) {
-       LOG(log_error, logtype_default, "comswitch: can't find handler!" );
+       LOG(log_error, logtype_papd, "comswitch: can't find handler!" );
        return( -1 );
     }
     compop();

diff --git a/etc/papd/lp.c b/etc/papd/lp.c
index 59b27f988011b0b05e9a46377044fa3f64fb3ac8..1cf9ff9c7e730d05ea84e29e4ffcaa4c9956fd23 100644 (file)
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.13 2002-03-20 20:54:05 morgana Exp $
+ * $Id: lp.c,v 1.14 2002-09-29 23:29:13 sibaz Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -116,7 +116,7 @@ void lp_person( person )
        free( lp.lp_person );
     }
     if (( lp.lp_person = (char *)malloc( strlen( person ) + 1 )) == NULL ) {
-       LOG(log_error, logtype_default, "malloc: %m" );
+       LOG(log_error, logtype_papd, "malloc: %m" );
        exit( 1 );
     }
     strcpy( lp.lp_person, person );
@@ -147,7 +147,7 @@ void lp_host( host )
        free( lp.lp_host );
     }
     if (( lp.lp_host = (char *)malloc( strlen( host ) + 1 )) == NULL ) {
-       LOG(log_error, logtype_default, "malloc: %m" );
+       LOG(log_error, logtype_papd, "malloc: %m" );
        exit( 1 );
     }
     strcpy( lp.lp_host, host );
@@ -162,7 +162,7 @@ void lp_job( job )
        free( lp.lp_job );
     }
     if (( lp.lp_job = (char *)malloc( strlen( job ) + 1 )) == NULL ) {
-       LOG(log_error, logtype_default, "malloc: %m" );
+       LOG(log_error, logtype_papd, "malloc: %m" );
        exit( 1 );
     }
     for ( p = job, q = lp.lp_job; *p != '\0'; p++, q++ ) {
@@ -215,20 +215,20 @@ int lp_init( out, sat )
                            afpdpid++;
                        }
                        if (getpwnam(username) != NULL ) {
-                           LOG(log_info, logtype_default, "CAP authenticated %s", username);
+                           LOG(log_info, logtype_papd, "CAP authenticated %s", username);
                            lp_person(username);
                            authenticated = 1;
                        } else {
-                           LOG(log_info, logtype_default, "CAP error: invalid username: '%s'", username);
+                           LOG(log_info, logtype_papd, "CAP error: invalid username: '%s'", username);
                        }
                    } else {
-                       LOG(log_info, logtype_default, "CAP error: could not read username");
+                       LOG(log_info, logtype_papd, "CAP error: could not read username");
                    }
                } else {
-                   LOG(log_info, logtype_default, "CAP error: %m");
+                   LOG(log_info, logtype_papd, "CAP error: %m");
                }
            } else {
-               LOG(log_info, logtype_default, "CAP error: %m");
+               LOG(log_info, logtype_papd, "CAP error: %m");
            }
        }
 
@@ -239,7 +239,7 @@ int lp_init( out, sat )
        }
 
        if ( authenticated == 0 ) {
-           LOG(log_error, logtype_default, "lp_init: must authenticate" );
+           LOG(log_error, logtype_papd, "lp_init: must authenticate" );
            spoolerror( out, "Authentication required." );
            return( -1 );
        }
@@ -248,7 +248,7 @@ int lp_init( out, sat )
        if (( printer->p_flags & P_ACCOUNT ) && printer->p_pagecost > 0 &&
                ! ABS_canprint( lp.lp_person, printer->p_role,
                printer->p_srvid, cost, balance )) {
-           LOG(log_error, logtype_default, "lp_init: no ABS funds" );
+           LOG(log_error, logtype_papd, "lp_init: no ABS funds" );
            spoolerror( out, "No ABS funds available." );
            return( -1 );
        }
@@ -256,12 +256,12 @@ int lp_init( out, sat )
     }
 
     if ( gethostname( hostname, sizeof( hostname )) < 0 ) {
-       LOG(log_error, logtype_default, "gethostname: %m" );
+       LOG(log_error, logtype_papd, "gethostname: %m" );
        exit( 1 );
     }
 
     if ( lp.lp_flags & LP_INIT ) {
-       LOG(log_error, logtype_default, "lp_init: already inited, die!" );
+       LOG(log_error, logtype_papd, "lp_init: already inited, die!" );
        abort();
     }
 
@@ -272,31 +272,31 @@ int lp_init( out, sat )
     if ( printer->p_flags & P_SPOOLED ) {
        /* check if queuing is enabled: mode & 010 on lock file */
        if ( stat( printer->p_lock, &st ) < 0 ) {
-           LOG(log_error, logtype_default, "lp_init: %s: %m", printer->p_lock );
+           LOG(log_error, logtype_papd, "lp_init: %s: %m", printer->p_lock );
            spoolerror( out, NULL );
            return( -1 );
        }
        if ( st.st_mode & 010 ) {
-           LOG(log_info, logtype_default, "lp_init: queuing is disabled" );
+           LOG(log_info, logtype_papd, "lp_init: queuing is disabled" );
            spoolerror( out, "Queuing is disabled." );
            return( -1 );
        }
 
        if (( fd = open( ".seq", O_RDWR|O_CREAT, 0661 )) < 0 ) {
-           LOG(log_error, logtype_default, "lp_init: can't create .seq" );
+           LOG(log_error, logtype_papd, "lp_init: can't create .seq" );
            spoolerror( out, NULL );
            return( -1 );
        }
 
        if ( flock( fd, LOCK_EX ) < 0 ) {
-           LOG(log_error, logtype_default, "lp_init: can't lock .seq" );
+           LOG(log_error, logtype_papd, "lp_init: can't lock .seq" );
            spoolerror( out, NULL );
            return( -1 );
        }
 
        n = 0;
        if (( len = read( fd, buf, sizeof( buf ))) < 0 ) {
-           LOG(log_error, logtype_default, "lp_init read: %m" );
+           LOG(log_error, logtype_papd, "lp_init read: %m" );
            spoolerror( out, NULL );
            return( -1 );
        }
@@ -336,7 +336,7 @@ int lp_open( out, sat )
        return( -1 );
     }
     if ( lp.lp_flags & LP_OPEN ) {
-       LOG(log_error, logtype_default, "lp_open already open" );
+       LOG(log_error, logtype_papd, "lp_open already open" );
        abort();
     }
 
@@ -345,14 +345,14 @@ int lp_open( out, sat )
        if (lp.lp_person != NULL) {
            if((pwent = getpwnam(lp.lp_person)) != NULL) {
                if(setreuid(pwent->pw_uid, pwent->pw_uid) != 0) {
-                   LOG(log_info, logtype_default, "setreuid error: %m");
+                   LOG(log_info, logtype_papd, "setreuid error: %m");
                }
            } else {
-               LOG(log_info, logtype_default, "Error getting username (%s)", lp.lp_person);
+               LOG(log_info, logtype_papd, "Error getting username (%s)", lp.lp_person);
            }
        }
        if (( lp.lp_stream = popen( printer->p_printer, "w" )) == NULL ) {
-           LOG(log_error, logtype_default, "lp_open popen %s: %m", printer->p_printer );
+           LOG(log_error, logtype_papd, "lp_open popen %s: %m", printer->p_printer );
            spoolerror( out, NULL );
            return( -1 );
        }
@@ -360,33 +360,33 @@ int lp_open( out, sat )
        sprintf( name, "df%c%03d%s", lp.lp_letter++, lp.lp_seq, hostname );
 
        if (( fd = open( name, O_WRONLY|O_CREAT|O_EXCL, 0660 )) < 0 ) {
-           LOG(log_error, logtype_default, "lp_open %s: %m", name );
+           LOG(log_error, logtype_papd, "lp_open %s: %m", name );
            spoolerror( out, NULL );
            return( -1 );
        }
 
        if (lp.lp_person != NULL) {
            if ((pwent = getpwnam(lp.lp_person)) == NULL) {
-               LOG(log_error, logtype_default, "getpwnam %s: no such user", lp.lp_person);
+               LOG(log_error, logtype_papd, "getpwnam %s: no such user", lp.lp_person);
                spoolerror( out, NULL );
                return( -1 );
            }
        } else {
            if ((pwent = getpwnam(printer->p_operator)) == NULL) {
-               LOG(log_error, logtype_default, "getpwnam %s: no such user", printer->p_operator);
+               LOG(log_error, logtype_papd, "getpwnam %s: no such user", printer->p_operator);
                spoolerror( out, NULL );
                return( -1 );
            }
        }
 
        if (fchown(fd, pwent->pw_uid, -1) < 0) {
-           LOG(log_error, logtype_default, "chown %s %s: %m", pwent->pw_name, name);
+           LOG(log_error, logtype_papd, "chown %s %s: %m", pwent->pw_name, name);
            spoolerror( out, NULL );
            return( -1 );
        }
 
        if (( lp.lp_stream = fdopen( fd, "w" )) == NULL ) {
-           LOG(log_error, logtype_default, "lp_open fdopen: %m" );
+           LOG(log_error, logtype_papd, "lp_open fdopen: %m" );
            spoolerror( out, NULL );
            return( -1 );
        }
@@ -416,7 +416,7 @@ int lp_write( buf, len )
     }
 
     if ( fwrite( buf, 1, len, lp.lp_stream ) != len ) {
-       LOG(log_error, logtype_default, "lp_write: %m" );
+       LOG(log_error, logtype_papd, "lp_write: %m" );
        abort();
     }
     return( 0 );
@@ -438,7 +438,7 @@ int lp_cancel()
     for ( letter = 'A'; letter < lp.lp_letter; letter++ ) {
        sprintf( name, "df%c%03d%s", letter, lp.lp_seq, hostname );
        if ( unlink( name ) < 0 ) {
-           LOG(log_error, logtype_default, "lp_cancel unlink %s: %m", name );
+           LOG(log_error, logtype_papd, "lp_cancel unlink %s: %m", name );
        }
     }
 
@@ -468,11 +468,11 @@ int lp_print()
     if ( printer->p_flags & P_SPOOLED ) {
        sprintf( tfname, "tfA%03d%s", lp.lp_seq, hostname );
        if (( fd = open( tfname, O_WRONLY|O_EXCL|O_CREAT, 0660 )) < 0 ) {
-           LOG(log_error, logtype_default, "lp_print %s: %m", tfname );
+           LOG(log_error, logtype_papd, "lp_print %s: %m", tfname );
            return 0;
        }
        if (( cfile = fdopen( fd, "w" )) == NULL ) {
-           LOG(log_error, logtype_default, "lp_print %s: %m", tfname );
+           LOG(log_error, logtype_papd, "lp_print %s: %m", tfname );
            return 0;
        }
        fprintf( cfile, "H%s\n", hostname );    /* XXX lp_host? */
@@ -513,36 +513,36 @@ int lp_print()
 
        sprintf( cfname, "cfA%03d%s", lp.lp_seq, hostname );
        if ( link( tfname, cfname ) < 0 ) {
-           LOG(log_error, logtype_default, "lp_print can't link %s to %s: %m", cfname,
+           LOG(log_error, logtype_papd, "lp_print can't link %s to %s: %m", cfname,
                    tfname );
            return 0;
        }
        unlink( tfname );
 
        if (( s = lp_conn_unix()) < 0 ) {
-           LOG(log_error, logtype_default, "lp_print: lp_conn_unix: %m" );
+           LOG(log_error, logtype_papd, "lp_print: lp_conn_unix: %m" );
            return 0;
        }
 
        sprintf( buf, "\1%s\n", printer->p_printer );
        n = strlen( buf );
        if ( write( s, buf, n ) != n ) {
-           LOG(log_error, logtype_default, "lp_print write: %m" );
+           LOG(log_error, logtype_papd, "lp_print write: %m" );
            return 0;
        }
        if ( read( s, buf, 1 ) != 1 ) {
-           LOG(log_error, logtype_default, "lp_print read: %m" );
+           LOG(log_error, logtype_papd, "lp_print read: %m" );
            return 0;
        }
 
        lp_disconn_unix( s );
 
        if ( buf[ 0 ] != '\0' ) {
-           LOG(log_error, logtype_default, "lp_print lpd said %c: %m", buf[ 0 ] );
+           LOG(log_error, logtype_papd, "lp_print lpd said %c: %m", buf[ 0 ] );
            return 0;
        }
     }
-    LOG(log_info, logtype_default, "lp_print queued" );
+    LOG(log_info, logtype_papd, "lp_print queued" );
     return 0;
 }
 
@@ -557,7 +557,7 @@ int lp_conn_unix()
     struct sockaddr_un saun;
 
     if (( s = socket( AF_UNIX, SOCK_STREAM, 0 )) < 0 ) {
-       LOG(log_error, logtype_default, "lp_conn_unix socket: %m" );
+       LOG(log_error, logtype_papd, "lp_conn_unix socket: %m" );
        return( -1 );
     }
     memset( &saun, 0, sizeof( struct sockaddr_un ));
@@ -565,7 +565,7 @@ int lp_conn_unix()
     strcpy( saun.sun_path, _PATH_DEVPRINTER );
     if ( connect( s, (struct sockaddr *)&saun,
            strlen( saun.sun_path ) + 2 ) < 0 ) {
-       LOG(log_error, logtype_default, "lp_conn_unix connect %s: %m", saun.sun_path );
+       LOG(log_error, logtype_papd, "lp_conn_unix connect %s: %m", saun.sun_path );
        close( s );
        return( -1 );
     }
@@ -586,22 +586,22 @@ int lp_conn_inet()
     struct hostent     *hp;
 
     if (( sp = getservbyname( "printer", "tcp" )) == NULL ) {
-       LOG(log_error, logtype_default, "printer/tcp: unknown service\n" );
+       LOG(log_error, logtype_papd, "printer/tcp: unknown service\n" );
        return( -1 );
     }
 
     if ( gethostname( hostname, sizeof( hostname )) < 0 ) {
-       LOG(log_error, logtype_default, "gethostname: %m" );
+       LOG(log_error, logtype_papd, "gethostname: %m" );
        exit( 1 );
     }
 
     if (( hp = gethostbyname( hostname )) == NULL ) {
-       LOG(log_error, logtype_default, "%s: unknown host\n", hostname );
+       LOG(log_error, logtype_papd, "%s: unknown host\n", hostname );
        return( -1 );
     }
 
     if (( privfd = rresvport( &port )) < 0 ) {
-       LOG(log_error, logtype_default, "lp_connect: socket: %m" );
+       LOG(log_error, logtype_papd, "lp_connect: socket: %m" );
        close( privfd );
        return( -1 );
     }
@@ -614,7 +614,7 @@ int lp_conn_inet()
 
     if ( connect( privfd, (struct sockaddr *)&sin,
            sizeof( struct sockaddr_in )) < 0 ) {
-       LOG(log_error, logtype_default, "lp_connect: %m" );
+       LOG(log_error, logtype_papd, "lp_connect: %m" );
        close( privfd );
        return( -1 );
     }
@@ -629,7 +629,7 @@ int lp_rmjob( job )
     int                n, s;
 
     if (( s = lp_conn_inet()) < 0 ) {
-       LOG(log_error, logtype_default, "lp_rmjob: %m" );
+       LOG(log_error, logtype_papd, "lp_rmjob: %m" );
        return( -1 );
     }
 
@@ -640,12 +640,12 @@ int lp_rmjob( job )
     sprintf( buf, "\5%s %s %d\n", printer->p_printer, lp.lp_person, job );
     n = strlen( buf );
     if ( write( s, buf, n ) != n ) {
-       LOG(log_error, logtype_default, "lp_rmjob write: %m" );
+       LOG(log_error, logtype_papd, "lp_rmjob write: %m" );
        lp_disconn_inet( s );
        return( -1 );
     }
     while (( n = read( s, buf, sizeof( buf ))) > 0 ) {
-       LOG(log_debug, logtype_default, "read %.*s", n, buf );
+       LOG(log_debug, logtype_papd, "read %.*s", n, buf );
     }
 
     lp_disconn_inet( s );
@@ -671,14 +671,14 @@ int lp_queue( out )
     int                                n, len, s;
        
     if (( s = lp_conn_unix()) < 0 ) {
-       LOG(log_error, logtype_default, "lp_queue: %m" );
+       LOG(log_error, logtype_papd, "lp_queue: %m" );
        return( -1 );
     }
 
     sprintf( buf, "\3%s\n", printer->p_printer );
     n = strlen( buf );
     if ( write( s, buf, n ) != n ) {
-       LOG(log_error, logtype_default, "lp_queue write: %m" );
+       LOG(log_error, logtype_papd, "lp_queue write: %m" );
        lp_disconn_unix( s );
        return( -1 );
     }

diff --git a/etc/papd/magics.c b/etc/papd/magics.c
index e95361f0d0aecdb84bc0f7654abfe17a735d3804..00ef3f4278d5ed31f6cccb1431550a3142aac09b 100644 (file)
--- a/etc/papd/magics.c
+++ b/etc/papd/magics.c
@@ -1,5 +1,5 @@
 /*
- * $Id: magics.c,v 1.9 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: magics.c,v 1.10 2002-09-29 23:29:13 sibaz Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -63,7 +63,7 @@ int ps( infile, outfile, sat )
 
                /* set up spool file */
                if ( lp_open( outfile, sat ) < 0 ) {
-                   LOG(log_error, logtype_default, "lp_open failed" );
+                   LOG(log_error, logtype_papd, "lp_open failed" );
                    spoolerror( outfile, "Ignoring job." );
                }
            }
@@ -131,7 +131,7 @@ int cm_psadobe( in, out, sat )
        if ( in->pf_state & PF_BOT ) {
            in->pf_state &= ~PF_BOT;
            if ( lp_open( out, sat ) < 0 ) {
-               LOG(log_error, logtype_default, "lp_open failed" );
+               LOG(log_error, logtype_papd, "lp_open failed" );
                spoolerror( out, "Ignoring job." );
            }
        } else {
@@ -182,12 +182,12 @@ int cm_psswitch( in, out, sat )
     if ( stop - p >= strlen( Query ) &&
            strncmp( p, Query, strlen( Query )) == 0 ) {
        if ( comswitch( magics, cm_psquery ) < 0 ) {
-           LOG(log_error, logtype_default, "cm_psswitch: can't find psquery!" );
+           LOG(log_error, logtype_papd, "cm_psswitch: can't find psquery!" );
            exit( 1 );
        }
     } else {
        if ( comswitch( magics, cm_psadobe ) < 0 ) {
-           LOG(log_error, logtype_default, "cm_psswitch: can't find psadobe!" );
+           LOG(log_error, logtype_papd, "cm_psswitch: can't find psadobe!" );
            exit( 1 );
        }
     }

diff --git a/etc/papd/main.c b/etc/papd/main.c
index 242b659a562b57566f7c1d72cec68323e2b50b56..26d4526712bf8632a900f18fd04997f161bc7851 100644 (file)
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.16 2002-08-20 20:25:54 srittau Exp $
+ * $Id: main.c,v 1.17 2002-09-29 23:29:14 sibaz Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -119,11 +119,11 @@ die( n )
     for ( pr = printers; pr; pr = pr->p_next ) {
        if ( pr->p_flags & P_REGISTERED ) {
            if ( nbp_unrgstr( pr->p_name, pr->p_type, pr->p_zone, &addr ) < 0 ) {
-               LOG(log_error, logtype_default, "can't unregister %s:%s@%s\n", pr->p_name,
+               LOG(log_error, logtype_papd, "can't unregister %s:%s@%s\n", pr->p_name,
                        pr->p_type, pr->p_zone );
                papd_exit( n + 1 );
            }
-           LOG(log_error, logtype_default, "unregister %s:%s@%s\n", pr->p_name, pr->p_type,
+           LOG(log_error, logtype_papd, "unregister %s:%s@%s\n", pr->p_name, pr->p_type,
                    pr->p_zone );
        }
     }
@@ -141,17 +141,17 @@ reap()
     while (( pid = wait3( &status, WNOHANG, 0 )) > 0 ) {
        if ( WIFEXITED( status )) {
            if ( WEXITSTATUS( status )) {
-               LOG(log_error, logtype_default, "child %d exited with %d", pid,
+               LOG(log_error, logtype_papd, "child %d exited with %d", pid,
                        WEXITSTATUS( status ));
            } else {
-               LOG(log_info, logtype_default, "child %d done", pid );
+               LOG(log_info, logtype_papd, "child %d done", pid );
            }
        } else {
            if ( WIFSIGNALED( status )) {
-               LOG(log_error, logtype_default, "child %d killed with %d", pid,
+               LOG(log_error, logtype_papd, "child %d killed with %d", pid,
                        WTERMSIG( status ));
            } else {
-               LOG(log_error, logtype_default, "child %d died", pid );
+               LOG(log_error, logtype_papd, "child %d died", pid );
            }
        }
     }
@@ -275,29 +275,29 @@ int main( ac, av )
     syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr );
 #endif /* ultrix */
 
-    LOG(log_info, logtype_default, "restart (%s)", version );
+    LOG(log_info, logtype_papd, "restart (%s)", version );
 
     for ( pr = printers; pr; pr = pr->p_next ) {
        if (( pr->p_flags & P_SPOOLED ) && rprintcap( pr ) < 0 ) {
-           LOG(log_error, logtype_default, "printcap problem: %s", pr->p_printer );
+           LOG(log_error, logtype_papd, "printcap problem: %s", pr->p_printer );
        }
        if (( pr->p_atp = atp_open( ATADDR_ANYPORT, &pr->p_addr )) == NULL ) {
-           LOG(log_error, logtype_default, "atp_open: %m" );
+           LOG(log_error, logtype_papd, "atp_open: %m" );
            papd_exit( 1 );
        }
        if ( nbp_rgstr( atp_sockaddr( pr->p_atp ), pr->p_name, pr->p_type,
                pr->p_zone ) < 0 ) {
-           LOG(log_error, logtype_default, "can't register %s:%s@%s", pr->p_name, pr->p_type,
+           LOG(log_error, logtype_papd, "can't register %s:%s@%s", pr->p_name, pr->p_type,
                    pr->p_zone );
            die( 1 );
        }
        if ( pr->p_flags & P_AUTH ) {
-               LOG(log_info, logtype_default, "Authentication enabled: %s", pr->p_name );
+               LOG(log_info, logtype_papd, "Authentication enabled: %s", pr->p_name );
        }
        else {
-               LOG(log_info, logtype_default, "Authentication disabled: %s", pr->p_name );
+               LOG(log_info, logtype_papd, "Authentication disabled: %s", pr->p_name );
        }
-       LOG(log_info, logtype_default, "register %s:%s@%s", pr->p_name, pr->p_type,
+       LOG(log_info, logtype_papd, "register %s:%s@%s", pr->p_name, pr->p_type,
                pr->p_zone );
        pr->p_flags |= P_REGISTERED;
     }
@@ -307,7 +307,7 @@ int main( ac, av )
     sigemptyset( &sv.sa_mask );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
-       LOG(log_error, logtype_default, "sigaction: %m" );
+       LOG(log_error, logtype_papd, "sigaction: %m" );
        papd_exit( 1 );
     }
 
@@ -315,7 +315,7 @@ int main( ac, av )
     sigemptyset( &sv.sa_mask );
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) {
-       LOG(log_error, logtype_default, "sigaction: %m" );
+       LOG(log_error, logtype_papd, "sigaction: %m" );
        papd_exit( 1 );
     }
 
@@ -336,7 +336,7 @@ int main( ac, av )
            if ( errno == EINTR ) {
                continue;
            }
-           LOG(log_error, logtype_default, "select: %m" );
+           LOG(log_error, logtype_papd, "select: %m" );
            papd_exit( 1 );
        }
 
@@ -360,7 +360,7 @@ int main( ac, av )
                atpb.atp_rreqdata = cbuf;
                atpb.atp_rreqdlen = sizeof( cbuf );
                if ( atp_rreq( pr->p_atp, &atpb ) < 0 ) {
-                   LOG(log_error, logtype_default, "atp_rreq: %m" );
+                   LOG(log_error, logtype_papd, "atp_rreq: %m" );
                    continue;
                }
 
@@ -376,7 +376,7 @@ int main( ac, av )
                    rbuf[ 2 ] = rbuf[ 3 ] = 0;
 
                    if (( pr->p_flags & P_SPOOLED ) && rprintcap( pr ) != 0 ) {
-                       LOG(log_error, logtype_default, "printcap problem: %s",
+                       LOG(log_error, logtype_papd, "printcap problem: %s",
                                pr->p_printer );
                        rbuf[ 2 ] = rbuf[ 3 ] = 0xff;
                        err = 1;
@@ -389,7 +389,7 @@ int main( ac, av )
                     */
                    if (( atp = atp_open( ATADDR_ANYPORT, 
                                          &pr->p_addr)) == NULL ) {
-                       LOG(log_error, logtype_default, "atp_open: %m" );
+                       LOG(log_error, logtype_papd, "atp_open: %m" );
                        rbuf[ 2 ] = rbuf[ 3 ] = 0xff;
                        err = 1;
                    }
@@ -405,7 +405,7 @@ int main( ac, av )
                     * This may error out if we lose a route, so we won't die().
                     */
                    if ( atp_sresp( pr->p_atp, &atpb ) < 0 ) {
-                       LOG(log_error, logtype_default, "atp_sresp: %m" );
+                       LOG(log_error, logtype_papd, "atp_sresp: %m" );
                        continue;
                    }
 
@@ -415,7 +415,7 @@ int main( ac, av )
 
                    switch ( c = fork()) {
                    case -1 :
-                       LOG(log_error, logtype_default, "fork: %m" );
+                       LOG(log_error, logtype_papd, "fork: %m" );
                        continue;
 
                    case 0 : /* child */
@@ -423,7 +423,7 @@ int main( ac, av )
 
                        if (( printer->p_flags & P_SPOOLED ) &&
                                chdir( printer->p_spool ) < 0 ) {
-                           LOG(log_error, logtype_default, "chdir %s: %m", printer->p_spool );
+                           LOG(log_error, logtype_papd, "chdir %s: %m", printer->p_spool );
                            exit( 1 );
                        }
 
@@ -431,7 +431,7 @@ int main( ac, av )
                        sigemptyset( &sv.sa_mask );
                        sv.sa_flags = SA_RESTART;
                        if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
-                           LOG(log_error, logtype_default, "sigaction: %m" );
+                           LOG(log_error, logtype_papd, "sigaction: %m" );
                            exit( 1 );
                        }
 
@@ -440,14 +440,14 @@ int main( ac, av )
                        }
                        sat.sat_port = sock;
                        if ( session( atp, &sat ) < 0 ) {
-                           LOG(log_error, logtype_default, "bad session" );
+                           LOG(log_error, logtype_papd, "bad session" );
                            exit( 1 );
                        }
                        exit( 0 );
                        break;
 
                    default : /* parent */
-                       LOG(log_info, logtype_default, "child %d for \"%s\" from %u.%u",
+                       LOG(log_info, logtype_papd, "child %d for \"%s\" from %u.%u",
                                c, pr->p_name, ntohs( sat.sat_addr.s_net ),
                                sat.sat_addr.s_node);
                        atp_close( atp );
@@ -469,12 +469,12 @@ int main( ac, av )
                     * This may error out if we lose a route, so we won't die().
                     */
                    if ( atp_sresp( pr->p_atp, &atpb ) < 0 ) {
-                       LOG(log_error, logtype_default, "atp_sresp: %m" );
+                       LOG(log_error, logtype_papd, "atp_sresp: %m" );
                    }
                    break;
 
                default :
-                   LOG(log_error, logtype_default, "Bad request from %u.%u!",
+                   LOG(log_error, logtype_papd, "Bad request from %u.%u!",
                            ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node );
                    continue;
                    break;
@@ -494,7 +494,7 @@ int main( ac, av )
                 * This may error out if we lose a route, so we won't die().
                 */
                if ( atp_sresp( pr->p_atp, &atpb ) < 0 ) {
-                   LOG(log_error, logtype_default, "atp_sresp: %m" );
+                   LOG(log_error, logtype_papd, "atp_sresp: %m" );
                }
 #endif /* notdef */
            }
@@ -708,7 +708,7 @@ int rprintcap( pr )
      */
     if ( pr->p_flags & P_SPOOLED ) {
        if ( pgetent( printcap, buf, pr->p_printer ) != 1 ) {
-           LOG(log_error, logtype_default, "No such printer: %s", pr->p_printer );
+           LOG(log_error, logtype_papd, "No such printer: %s", pr->p_printer );
            return( -1 );
        }
 
@@ -723,7 +723,7 @@ int rprintcap( pr )
            pr->p_spool = defprinter.p_spool;
        } else {
            if (( pr->p_spool = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %m" );
                exit( 1 );
            }
            strcpy( pr->p_spool, p );
@@ -747,7 +747,7 @@ int rprintcap( pr )
            } else {
                if (( pr->p_role =
                        (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-                   LOG(log_error, logtype_default, "malloc: %m" );
+                   LOG(log_error, logtype_papd, "malloc: %m" );
                    exit( 1 );
                }
                strcpy( pr->p_role, p );
@@ -773,7 +773,7 @@ int rprintcap( pr )
        if (( p = pgetstr( "pc", &a )) != NULL ) {
            if (( pr->p_pagecost_msg =
                    (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %m" );
                exit( 1 );
            }
            strcpy( pr->p_pagecost_msg, p );
@@ -798,7 +798,7 @@ int rprintcap( pr )
            pr->p_lock = defprinter.p_lock;
        } else {
            if (( pr->p_lock = (char *)malloc( strlen( p ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %m" );
                exit( 1 );
            }
            strcpy( pr->p_lock, p );

diff --git a/etc/papd/ppd.c b/etc/papd/ppd.c
index c2c64240a2b89d51697209369c65907d556d38e6..dcaea66fc91f8bc8b25868cb1959dd9741b194a4 100644 (file)
--- a/etc/papd/ppd.c
+++ b/etc/papd/ppd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ppd.c,v 1.8 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: ppd.c,v 1.9 2002-09-29 23:29:14 sibaz Exp $
  *
  * Copyright (c) 1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -74,7 +74,7 @@ struct ppdent *getppdent( stream )
            continue;
        }
        if ( p[ strlen( p ) - 1 ] != '\n' ) {
-           LOG(log_error, logtype_default, "getppdent: line too long" );
+           LOG(log_error, logtype_papd, "getppdent: line too long" );
            continue;
        }
 
@@ -154,12 +154,12 @@ int read_ppd( file, fcnt )
     struct ppd_font    *pfo;
 
     if ( fcnt > 20 ) {
-       LOG(log_error, logtype_default, "read_ppd: %s: Too many files!", file );
+       LOG(log_error, logtype_papd, "read_ppd: %s: Too many files!", file );
        return( -1 );
     }
 
     if (( ppdfile = fopen( file, "r" )) == NULL ) {
-       LOG(log_error, logtype_default, "read_ppd %s: %m", file );
+       LOG(log_error, logtype_papd, "read_ppd %s: %m", file );
        return( -1 );
     }
 
@@ -183,12 +183,12 @@ int read_ppd( file, fcnt )
 
            if (( pfo = (struct ppd_font *)malloc( sizeof( struct ppd_font )))
                    == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %m" );
                exit( 1 );
            }
            if (( pfo->pd_font =
                    (char *)malloc( strlen( pe->pe_option ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %m" );
                exit( 1 );
            }
            strcpy( pfo->pd_font, pe->pe_option );
@@ -207,7 +207,7 @@ int read_ppd( file, fcnt )
        if ( pfe->pd_name && (pfe->pd_value == NULL) ) {
            if (( pfe->pd_value =
                    (char *)malloc( strlen( pe->pe_value ) + 1 )) == NULL ) {
-               LOG(log_error, logtype_default, "malloc: %m" );
+               LOG(log_error, logtype_papd, "malloc: %m" );
                exit( 1 );
            }
 

diff --git a/etc/papd/queries.c b/etc/papd/queries.c
index 279c0d1e184ce2cde4cab4942a23fe3c2d82535c..a1ef26066a6f81a84435fbdedbb04f88eb1fb443 100644 (file)
--- a/etc/papd/queries.c
+++ b/etc/papd/queries.c
@@ -1,5 +1,5 @@
 /*
- * $Id: queries.c,v 1.14 2002-03-12 17:06:49 morgana 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.
@@ -145,13 +145,13 @@ int cq_k4login( in, out )
 
     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 );
@@ -183,7 +183,7 @@ int cq_uameth( in, out )
        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 );
@@ -358,7 +358,7 @@ int cq_query( in, 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 );
@@ -504,7 +504,7 @@ int cq_feature( in, out )
 
            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 );
@@ -549,7 +549,7 @@ int cq_printer( in, out )
 
            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 );
@@ -561,9 +561,9 @@ int cq_printer( in, out )
                }
            }
            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 );
@@ -571,7 +571,7 @@ int cq_printer( in, out )
 
            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 );
@@ -659,7 +659,7 @@ int cq_listq( in, out )
     }
 
     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();
@@ -712,7 +712,7 @@ int cq_rbilogin( in, out )
 
            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 {

diff --git a/etc/papd/session.c b/etc/papd/session.c
index 3ac3df8f2fddf13bfd3c245c30f02370717408ed..62b21a8e893390824ade86ee3d32e3db0241bccf 100644 (file)
--- a/etc/papd/session.c
+++ b/etc/papd/session.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session.c,v 1.13 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: session.c,v 1.14 2002-09-29 23:29:14 sibaz Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -102,7 +102,7 @@ int session( atp, sat )
     atpb.atp_sreqto = 5;               /* retry timer */
     atpb.atp_sreqtries = -1;           /* infinite retries */
     if ( atp_sreq( atp, &atpb, oquantum, ATP_XO )) {
-       LOG(log_error, logtype_default, "atp_sreq: %m" );
+       LOG(log_error, logtype_papd, "atp_sreq: %m" );
        return( -1 );
     }
 
@@ -121,16 +121,16 @@ int session( atp, sat )
 
        do { /* do list until success or an unrecoverable error occurs */
          if (( cc = select( FD_SETSIZE, &fds, 0, 0, &tv )) < 0 )
-             LOG(log_error, logtype_default, "select: %m" ); /* log all errors */
+             LOG(log_error, logtype_papd, "select: %m" ); /* log all errors */
        } while (( cc < 0 ) && (errno == 4));
 
        if ( cc < 0 ) {
-         LOG(log_error, logtype_default, "select: Error is unrecoverable" );
+         LOG(log_error, logtype_papd, "select: Error is unrecoverable" );
          return( -1 );
        }
        if ( cc == 0 ) {
            if ( timeout++ > 2 ) {
-               LOG(log_error, logtype_default, "connection timed out" );
+               LOG(log_error, logtype_papd, "connection timed out" );
                lp_cancel();
                return( -1 );
            }
@@ -147,7 +147,7 @@ int session( atp, sat )
            atpb.atp_sreqto = 0;                /* best effort */
            atpb.atp_sreqtries = 1;             /* try once */
            if ( atp_sreq( atp, &atpb, 0, 0 )) {
-               LOG(log_error, logtype_default, "atp_sreq: %m" );
+               LOG(log_error, logtype_papd, "atp_sreq: %m" );
                return( -1 );
            }
            continue;
@@ -162,12 +162,12 @@ int session( atp, sat )
            atpb.atp_rreqdata = cbuf;
            atpb.atp_rreqdlen = sizeof( cbuf );
            if ( atp_rreq( atp, &atpb ) < 0 ) {
-               LOG(log_error, logtype_default, "atp_rreq: %m" );
+               LOG(log_error, logtype_papd, "atp_rreq: %m" );
                return( -1 );
            }
            /* sanity */
            if ( (unsigned char)cbuf[ 0 ] != connid ) {
-               LOG(log_error, logtype_default, "Bad ATP request!" );
+               LOG(log_error, logtype_papd, "Bad ATP request!" );
                continue;
            }
 
@@ -208,7 +208,7 @@ int session( atp, sat )
                atpb.atp_sresiov = niov;
                atpb.atp_sresiovcnt = 1;
                if ( atp_sresp( atp, &atpb ) < 0 ) {
-                   LOG(log_error, logtype_default, "atp_sresp: %m" );
+                   LOG(log_error, logtype_papd, "atp_sresp: %m" );
                    exit( 1 );
                }
                return( 0 );
@@ -217,7 +217,7 @@ int session( atp, sat )
            case PAP_TICKLE :
                break;
            default :
-               LOG(log_error, logtype_default, "Bad PAP request!" );
+               LOG(log_error, logtype_papd, "Bad PAP request!" );
            }
 
            break;
@@ -230,14 +230,14 @@ int session( atp, sat )
            atpb.atp_rresiov = niov;
            atpb.atp_rresiovcnt = oquantum;
            if ( atp_rresp( atp, &atpb ) < 0 ) {
-               LOG(log_error, logtype_default, "atp_rresp: %m" );
+               LOG(log_error, logtype_papd, "atp_rresp: %m" );
                return( -1 );
            }
 
            /* sanity */
            if ( ((unsigned char *)niov[ 0 ].iov_base)[ 0 ] != connid ||
                    ((char *)niov[ 0 ].iov_base)[ 1 ] != PAP_DATA ) {
-               LOG(log_error, logtype_default, "Bad data response!" );
+               LOG(log_error, logtype_papd, "Bad data response!" );
                continue;
            }
 
@@ -252,7 +252,7 @@ int session( atp, sat )
 
            /* move data */
            if ( ps( &infile, &outfile, sat ) < 0 ) {
-               LOG(log_error, logtype_default, "parse: bad return" );
+               LOG(log_error, logtype_papd, "parse: bad return" );
                return( -1 );   /* really?  close? */
            }
 
@@ -270,7 +270,7 @@ int session( atp, sat )
            atpb.atp_sreqto = 5;                /* retry timer */
            atpb.atp_sreqtries = -1;            /* infinite retries */
            if ( atp_sreq( atp, &atpb, oquantum, ATP_XO )) {
-               LOG(log_error, logtype_default, "atp_sreq: %m" );
+               LOG(log_error, logtype_papd, "atp_sreq: %m" );
                return( -1 );
            }
            break;
@@ -279,7 +279,7 @@ int session( atp, sat )
            break;
 
        default :
-           LOG(log_error, logtype_default, "atp_rsel: %m" );
+           LOG(log_error, logtype_papd, "atp_rsel: %m" );
            return( -1 );
        }
 
@@ -316,7 +316,7 @@ int session( atp, sat )
            atpb.atp_sresiov = niov;
            atpb.atp_sresiovcnt = i;    /* reported by stevebn@pc1.eos.co.uk */
            if ( atp_sresp( atp, &atpb ) < 0 ) {
-               LOG(log_error, logtype_default, "atp_sresp: %m" );
+               LOG(log_error, logtype_papd, "atp_sresp: %m" );
                return( -1 );
            }
            readpending = 0;

diff --git a/etc/papd/uam.c b/etc/papd/uam.c
index 0e4c37f2f5fcec545a4366b0d29714b2d5b052bd..75435aca908cf388bff6decadeb0007c35458b01 100644 (file)
--- a/etc/papd/uam.c
+++ b/etc/papd/uam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uam.c,v 1.7 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: uam.c,v 1.8 2002-09-29 23:29:14 sibaz Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -54,13 +54,13 @@ struct uam_mod *uam_load(const char *path, const char *name)
   void *module;
 
   if ((module = mod_open(path)) == NULL) {
-    LOG(log_error, logtype_default, "uam_load(%s): failed to load.", name);
-    LOG(log_error, logtype_default, dlerror());
+    LOG(log_error, logtype_papd, "uam_load(%s): failed to load.", name);
+    LOG(log_error, logtype_papd, dlerror());
     return NULL;
   }
 
   if ((mod = (struct uam_mod *) malloc(sizeof(struct uam_mod))) == NULL) {
-    LOG(log_error, logtype_default, "uam_load(%s): malloc failed", name);
+    LOG(log_error, logtype_papd, "uam_load(%s): malloc failed", name);
     goto uam_load_fail;
   }
 
@@ -72,7 +72,7 @@ struct uam_mod *uam_load(const char *path, const char *name)
   }
 
   if (mod->uam_fcn->uam_type != UAM_MODULE_SERVER) {
-    LOG(log_error, logtype_default, "uam_load(%s): attempted to load a non-server module",
+    LOG(log_error, logtype_papd, "uam_load(%s): attempted to load a non-server module",
           name);
     goto uam_load_err;
   }
@@ -81,7 +81,7 @@ struct uam_mod *uam_load(const char *path, const char *name)
 
   if (!mod->uam_fcn->uam_setup || 
       ((*mod->uam_fcn->uam_setup)(name) < 0)) {
-    LOG(log_error, logtype_default, "uam_load(%s): uam_setup failed", name);
+    LOG(log_error, logtype_papd, "uam_load(%s): uam_setup failed", name);
     goto uam_load_err;
   }
 
@@ -121,7 +121,7 @@ int uam_register(const int type, const char *path, const char *name, ...)
   if ((uam = auth_uamfind(type, name, strlen(name)))) {
     if (strcmp(uam->uam_path, path)) {
       /* it exists, but it's not the same module. */
-      LOG(log_error, logtype_default, "uam_register: \"%s\" already loaded by %s",
+      LOG(log_error, logtype_papd, "uam_register: \"%s\" already loaded by %s",
             name, path);
       return -1;
     }
@@ -239,7 +239,7 @@ int uam_checkuser(const struct passwd *pwd)
 
 #ifndef DISABLE_SHELLCHECK
   if (!p) {
-    LOG(log_info, logtype_default, "illegal shell %s for %s",pwd->pw_shell,pwd->pw_name);
+    LOG(log_info, logtype_papd, "illegal shell %s for %s",pwd->pw_shell,pwd->pw_name);
     return -1;
   }
 #endif /* DISABLE_SHELLCHECK */