1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/proftpd/proftpd.patch Tue Apr 21 11:54:34 2009 +0200
1.3 @@ -0,0 +1,117 @@
1.4 +Index: mod_otp/mod_otp.c
1.5 +--- mod_otp/mod_otp.c.orig 2006-12-06 17:13:06 +0100
1.6 ++++ mod_otp/mod_otp.c 2009-01-27 08:33:56 +0100
1.7 +@@ -79,7 +79,7 @@
1.8 + CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
1.9 +
1.10 + bool = get_boolean(cmd, 1);
1.11 +- if ((bool == -1)
1.12 ++ if (bool == -1)
1.13 + CONF_ERROR(cmd, "expecting Boolean parameter");
1.14 +
1.15 + c = add_config_param(cmd->argv[0], 1, NULL);
1.16 +@@ -128,7 +128,7 @@
1.17 + ": error generating challenge for user '%s': %s", cmd->argv[1], str);
1.18 +
1.19 + } else
1.20 +- pr_add_response_dup(R_DUP, "Challenge: [ %s ]", challenge);
1.21 ++ pr_response_add(R_DUP, "Challenge: [ %s ]", challenge);
1.22 +
1.23 + return DECLINED(cmd);
1.24 + }
1.25 +Index: mod_sql_odbc/mod_sql_odbc.c
1.26 +--- mod_sql_odbc/mod_sql_odbc.c.orig 2007-04-17 17:05:18 +0200
1.27 ++++ mod_sql_odbc/mod_sql_odbc.c 2009-01-27 19:16:56 +0100
1.28 +@@ -890,8 +890,8 @@
1.29 +
1.30 + /* Set up our timer, if necessary. */
1.31 + if (entry->ttl > 0) {
1.32 +- entry->timer = add_timer(entry->ttl, -1, &sql_odbc_module,
1.33 +- sqlodbc_timer_cb);
1.34 ++ entry->timer = pr_timer_add(entry->ttl, -1, &sql_odbc_module,
1.35 ++ sqlodbc_timer_cb, "mod_sql_odbc TTL");
1.36 +
1.37 + sql_log(DEBUG_INFO, "'%s' connection: %d second timer started",
1.38 + entry->name, entry->ttl);
1.39 +Index: mod_sql_sqlite/mod_sql_sqlite.c
1.40 +--- mod_sql_sqlite/mod_sql_sqlite.c.orig 2007-05-21 17:37:11 +0200
1.41 ++++ mod_sql_sqlite/mod_sql_sqlite.c 2009-01-27 19:15:57 +0100
1.42 +@@ -236,8 +236,8 @@
1.43 +
1.44 + /* Set up our timer, if necessary. */
1.45 + if (entry->ttl > 0) {
1.46 +- entry->timer = add_timer(entry->ttl, -1, &sql_sqlite_module,
1.47 +- sql_sqlite_timer_cb);
1.48 ++ entry->timer = pr_timer_add(entry->ttl, -1, &sql_sqlite_module,
1.49 ++ sql_sqlite_timer_cb, "mod_sql_sqlite TTL");
1.50 +
1.51 + sql_log(DEBUG_INFO, "'%s' connection: %d second timer started",
1.52 + entry->name, entry->ttl);
1.53 +Index: mod_time/mod_time.c
1.54 +--- mod_time/mod_time.c.orig 2004-05-12 20:57:06 +0200
1.55 ++++ mod_time/mod_time.c 2009-01-27 08:33:56 +0100
1.56 +@@ -146,7 +146,7 @@
1.57 + /* If we don't have a password file, we create an empty array and punt.
1.58 + */
1.59 + if (!pw) {
1.60 +- if (!name || !(pw = (struct passwd *) auth_getpwnam(p, name))) {
1.61 ++ if (!name || !(pw = (struct passwd *) pr_auth_getpwnam(p, name))) {
1.62 + *gids = make_array(p, 2, sizeof(gid_t));
1.63 + *groups = make_array(p, 2, sizeof(char *));
1.64 + return;
1.65 +@@ -172,7 +172,7 @@
1.66 + /* Now populate the names of the groups.
1.67 + */
1.68 + for (i = 0; i < total; i++) {
1.69 +- if ((gr = (struct group *) auth_getgrgid(p, ((gid_t *) xgids->elts)[i])))
1.70 ++ if ((gr = (struct group *) pr_auth_getgrgid(p, ((gid_t *) xgids->elts)[i])))
1.71 + *((char **) push_array(xgroups)) = pstrdup(p, gr->gr_name);
1.72 + }
1.73 +
1.74 +@@ -188,7 +188,7 @@
1.75 + /* Nothing there...punt.
1.76 + */
1.77 + if (!pw) {
1.78 +- if (!name || !(pw = (struct passwd *) auth_getpwnam(p, name))) {
1.79 ++ if (!name || !(pw = (struct passwd *) pr_auth_getpwnam(p, name))) {
1.80 + *gids = xgids;
1.81 + *groups = xgroups;
1.82 + return;
1.83 +@@ -197,16 +197,16 @@
1.84 +
1.85 + /* Populate the first group name.
1.86 + */
1.87 +- if ((gr = auth_getgrgid(p, pw->pw_gid)) != NULL)
1.88 ++ if ((gr = pr_auth_getgrgid(p, pw->pw_gid)) != NULL)
1.89 + *((char **) push_array(xgroups)) = pstrdup(p, gr->gr_name);
1.90 +
1.91 +- auth_setgrent(p);
1.92 ++ pr_auth_setgrent(p);
1.93 +
1.94 + /* This is where things get slow, expensive, and ugly.
1.95 + * Loop through everything, checking to make sure we haven't already added
1.96 + * it. This is why we have getgroups() and company.
1.97 + */
1.98 +- while ((gr = auth_getgrent(p)) != NULL && gr->gr_mem)
1.99 ++ while ((gr = pr_auth_getgrent(p)) != NULL && gr->gr_mem)
1.100 + for (gr_mem = gr->gr_mem; *gr_mem; gr_mem++) {
1.101 + if (strcmp(*gr_mem, pw->pw_name) == 0) {
1.102 + *((int *) push_array(xgids)) = (int) gr->gr_gid;
1.103 +@@ -634,7 +634,7 @@
1.104 + if (!session.user) {
1.105 + /* Populate the pw struct, check for a NULL return value. */
1.106 +
1.107 +- if ((pw = auth_getpwnam(cmd->tmp_pool, user)) == NULL)
1.108 ++ if ((pw = pr_auth_getpwnam(cmd->tmp_pool, user)) == NULL)
1.109 + return NULL;
1.110 +
1.111 + time_user = pstrdup(session.pool, pw->pw_name);
1.112 +@@ -1603,7 +1603,7 @@
1.113 + "%R", (session.c && session.c->remote_name ? session.c->remote_name : "(unknown)"),
1.114 + "%L", main_server->ServerFQDN,
1.115 + "%U", user,
1.116 +- "%u", session.ident_user,
1.117 ++ "%u", session.user,
1.118 + "%M", mesg_max,
1.119 + "%N", mesg_cur,
1.120 + "%E", main_server->ServerAdmin,
