michael@182: Index: mod_otp/mod_otp.c
michael@182: --- mod_otp/mod_otp.c.orig	2006-12-06 17:13:06 +0100
michael@182: +++ mod_otp/mod_otp.c	2009-01-27 08:33:56 +0100
michael@182: @@ -79,7 +79,7 @@
michael@182:    CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
michael@182:  
michael@182:    bool = get_boolean(cmd, 1);
michael@182: -  if ((bool == -1)
michael@182: +  if (bool == -1)
michael@182:      CONF_ERROR(cmd, "expecting Boolean parameter");
michael@182:  
michael@182:    c = add_config_param(cmd->argv[0], 1, NULL);
michael@182: @@ -128,7 +128,7 @@
michael@182:          ": error generating challenge for user '%s': %s", cmd->argv[1], str);
michael@182:  
michael@182:    } else
michael@182: -    pr_add_response_dup(R_DUP, "Challenge: [ %s ]", challenge);
michael@182: +    pr_response_add(R_DUP, "Challenge: [ %s ]", challenge);
michael@182:  
michael@182:    return DECLINED(cmd);
michael@182:  }
michael@182: Index: mod_sql_odbc/mod_sql_odbc.c
michael@182: --- mod_sql_odbc/mod_sql_odbc.c.orig	2007-04-17 17:05:18 +0200
michael@182: +++ mod_sql_odbc/mod_sql_odbc.c	2009-01-27 19:16:56 +0100
michael@182: @@ -890,8 +890,8 @@
michael@182:  
michael@182:    /* Set up our timer, if necessary. */
michael@182:    if (entry->ttl > 0) {
michael@182: -    entry->timer = add_timer(entry->ttl, -1, &sql_odbc_module,
michael@182: -      sqlodbc_timer_cb);
michael@182: +    entry->timer = pr_timer_add(entry->ttl, -1, &sql_odbc_module,
michael@182: +      sqlodbc_timer_cb, "mod_sql_odbc TTL");
michael@182:  
michael@182:      sql_log(DEBUG_INFO, "'%s' connection: %d second timer started",
michael@182:        entry->name, entry->ttl);
michael@182: Index: mod_sql_sqlite/mod_sql_sqlite.c
michael@182: --- mod_sql_sqlite/mod_sql_sqlite.c.orig	2007-05-21 17:37:11 +0200
michael@182: +++ mod_sql_sqlite/mod_sql_sqlite.c	2009-01-27 19:15:57 +0100
michael@182: @@ -236,8 +236,8 @@
michael@182:  
michael@182:    /* Set up our timer, if necessary. */
michael@182:    if (entry->ttl > 0) {
michael@182: -    entry->timer = add_timer(entry->ttl, -1, &sql_sqlite_module,
michael@182: -      sql_sqlite_timer_cb);
michael@182: +    entry->timer = pr_timer_add(entry->ttl, -1, &sql_sqlite_module,
michael@182: +      sql_sqlite_timer_cb, "mod_sql_sqlite TTL");
michael@182:  
michael@182:      sql_log(DEBUG_INFO, "'%s' connection: %d second timer started",
michael@182:        entry->name, entry->ttl);
michael@182: Index: mod_time/mod_time.c
michael@182: --- mod_time/mod_time.c.orig	2004-05-12 20:57:06 +0200
michael@182: +++ mod_time/mod_time.c	2009-01-27 08:33:56 +0100
michael@182: @@ -146,7 +146,7 @@
michael@182:    /* If we don't have a password file, we create an empty array and punt.
michael@182:     */
michael@182:    if (!pw) {
michael@182: -    if (!name || !(pw = (struct passwd *) auth_getpwnam(p, name))) {
michael@182: +    if (!name || !(pw = (struct passwd *) pr_auth_getpwnam(p, name))) {
michael@182:        *gids = make_array(p, 2, sizeof(gid_t));
michael@182:        *groups = make_array(p, 2, sizeof(char *));
michael@182:        return;
michael@182: @@ -172,7 +172,7 @@
michael@182:    /* Now populate the names of the groups.
michael@182:     */
michael@182:    for (i = 0; i < total; i++) {
michael@182: -    if ((gr = (struct group *) auth_getgrgid(p, ((gid_t *) xgids->elts)[i])))
michael@182: +    if ((gr = (struct group *) pr_auth_getgrgid(p, ((gid_t *) xgids->elts)[i])))
michael@182:        *((char **) push_array(xgroups)) = pstrdup(p, gr->gr_name);
michael@182:    }
michael@182:  
michael@182: @@ -188,7 +188,7 @@
michael@182:    /* Nothing there...punt.
michael@182:     */
michael@182:    if (!pw) {
michael@182: -    if (!name || !(pw = (struct passwd *) auth_getpwnam(p, name))) {
michael@182: +    if (!name || !(pw = (struct passwd *) pr_auth_getpwnam(p, name))) {
michael@182:        *gids = xgids;
michael@182:        *groups = xgroups;
michael@182:        return;
michael@182: @@ -197,16 +197,16 @@
michael@182:  
michael@182:    /* Populate the first group name.
michael@182:     */
michael@182: -  if ((gr = auth_getgrgid(p, pw->pw_gid)) != NULL)
michael@182: +  if ((gr = pr_auth_getgrgid(p, pw->pw_gid)) != NULL)
michael@182:      *((char **) push_array(xgroups)) = pstrdup(p, gr->gr_name);
michael@182:  
michael@182: -  auth_setgrent(p);
michael@182: +  pr_auth_setgrent(p);
michael@182:  
michael@182:    /* This is where things get slow, expensive, and ugly.
michael@182:     * Loop through everything, checking to make sure we haven't already added
michael@182:     * it.  This is why we have getgroups() and company.
michael@182:     */
michael@182: -  while ((gr = auth_getgrent(p)) != NULL && gr->gr_mem)
michael@182: +  while ((gr = pr_auth_getgrent(p)) != NULL && gr->gr_mem)
michael@182:      for (gr_mem = gr->gr_mem; *gr_mem; gr_mem++) {
michael@182:        if (strcmp(*gr_mem, pw->pw_name) == 0) {
michael@182:          *((int *) push_array(xgids)) = (int) gr->gr_gid;
michael@182: @@ -634,7 +634,7 @@
michael@182:    if (!session.user) {
michael@182:      /* Populate the pw struct, check for a NULL return value. */
michael@182:  
michael@182: -    if ((pw = auth_getpwnam(cmd->tmp_pool, user)) == NULL)
michael@182: +    if ((pw = pr_auth_getpwnam(cmd->tmp_pool, user)) == NULL)
michael@182:        return NULL;
michael@182:  
michael@182:      time_user = pstrdup(session.pool, pw->pw_name);
michael@182: @@ -1603,7 +1603,7 @@
michael@182:         "%R", (session.c && session.c->remote_name ?  session.c->remote_name : "(unknown)"),
michael@182:         "%L", main_server->ServerFQDN,
michael@182:         "%U", user,
michael@182: -       "%u", session.ident_user,
michael@182: +       "%u", session.user,
michael@182:         "%M", mesg_max,
michael@182:         "%N", mesg_cur,
michael@182:         "%E", main_server->ServerAdmin,