Free fix to re-enable some text in error messages.

[~andy/fetchmail] / lock.c

diff --git a/lock.c b/lock.c
index a9fcb2ae2dab2b7d95664bcc65550feea7dce1d0..8b3f03f318a6846613dfdde3243b46fd25769fcf 100644 (file)
--- a/lock.c
+++ b/lock.c
@@ -29,7 +29,7 @@ void lock_setup(void)
 {
     /* set up to do lock protocol */
 #define        FETCHMAIL_PIDFILE       "fetchmail.pid"
-    if (!getuid()) {
+    if (getuid() == ROOT_UID) {
        lockfile = (char *)xmalloc(
                sizeof(PID_DIR) + sizeof(FETCHMAIL_PIDFILE) + 1);
        sprintf(lockfile, "%s/%s", PID_DIR, FETCHMAIL_PIDFILE);
@@ -78,7 +78,7 @@ int lock_state(void)
        bkgd = (fscanf(lockfp, "%d %d", &pid, &st) == 2);
 
        if (kill(pid, 0) == -1) {
-           fprintf(stderr,_("fetchmail: removing stale lockfile\n"));
+           fprintf(stderr,GT_("fetchmail: removing stale lockfile\n"));
            pid = 0;
            unlink(lockfile);
        }
@@ -119,7 +119,7 @@ void lock_or_die(void)
       }
       else
       {
-         fprintf(stderr,       _("fetchmail: lock creation failed.\n"));
+         fprintf(stderr,       GT_("fetchmail: lock creation failed.\n"));
          exit(PS_EXCLUDE);
       }
     }