1 diff -Naur mod_watch-4.3.orig/mod_watch.c mod_watch-4.3/mod_watch.c
2 --- mod_watch-4.3.orig/mod_watch.c 2003-03-13 22:44:27.000000000 +0100
3 +++ mod_watch-4.3/mod_watch.c 2004-11-18 16:37:10.719093184 +0100
8 - if (apr_get_username(&username, uid, p) == APR_SUCCESS)
9 + if (apr_uid_name_get(&username, uid, p) == APR_SUCCESS)
12 return "unknown-user";
17 - if (apr_get_groupname(&groupname, gid, p) == APR_SUCCESS)
18 + if (apr_gid_name_get(&groupname, gid, p) == APR_SUCCESS)
21 return "unknown-group";
25 rc = fileReadWord(fp, word, &nbytes);
26 - if (!APR_STATUS_IS_SUCCESS(rc))
27 + if (rc != APR_SUCCESS)
30 return sscanf(word, format, number) == 1 ? APR_SUCCESS : APR_EGENERAL;
34 rc = fileReadWord(fp, word, &nbytes);
35 - if (!APR_STATUS_IS_SUCCESS(rc))
36 + if (rc != APR_SUCCESS)
39 return sscanf(word, "%lf", number) == 1 ? APR_SUCCESS : APR_EGENERAL;