vpopmail patch
Arkadiusz Chomicki
duch w wla.pl
Nie, 11 Sty 2004, 23:03:02 CET
witam
w vpopmail jest blad w pliku vmysql.h
brakuje backslash (\) na koncu lini 54 i 58
podsylam patch. byc moze blad juz jest znaleziony ale w cvs jeszcze
nie jest poprawiony
Pozdrawiam
ChomAr
--
+-=========================| Arkadiusz Chomicki |=====================-+
84-120 Władysławowo GG#: 420515
woj. pomorskie e-mail:chomar(at)wla(dot)pl
Registered User: 82605 http://www.chomar.wla.pl
http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=82605
+-====================================================================-+
-------------- następna część ---------
diff -urN vpopmail-5.3.3.orig/vmysql.h vpopmail-5.3.3/vmysql.h
--- vpopmail-5.3.3.orig/vmysql.h 2004-01-11 22:51:29.024989008 +0100
+++ vpopmail-5.3.3/vmysql.h 2004-01-11 22:52:31.456497976 +0100
@@ -51,11 +51,11 @@
primary key (pw_name, pw_domain ) "
#else
#define TABLE_LAYOUT "pw_name char(32) not null, \
-pw_domain char(64) not null,
+pw_domain char(64) not null, \
pw_passwd char(40), \
pw_uid int, pw_gid int, \
pw_gecos char(48), \
-pw_dir char(160),
+pw_dir char(160), \
pw_shell char(20), \
primary key (pw_name, pw_domain ) "
#endif
diff -urN vpopmail-5.3.3.orig/vmysql.h~ vpopmail-5.3.3/vmysql.h~
--- vpopmail-5.3.3.orig/vmysql.h~ 1970-01-01 01:00:00.000000000 +0100
+++ vpopmail-5.3.3/vmysql.h~ 2002-02-02 03:06:13.000000000 +0100
@@ -0,0 +1,255 @@
+/*
+ * vmyvsql.h
+ * part of the vchkpw package
+ *
+ * Copyright (C) 1999 Inter7 Internet Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifndef VPOPMAIL_MYSQL_H
+#define VPOPMAIL_MYSQL_H
+
+/* Edit to match your set up */
+#define MYSQL_UPDATE_SERVER "localhost"
+#define MYSQL_UPDATE_USER "root"
+#define MYSQL_UPDATE_PASSWD "secret"
+
+#define MYSQL_READ_SERVER "localhost"
+#define MYSQL_READ_USER "root"
+#define MYSQL_READ_PASSWD "secret"
+/* End of setup section*/
+
+/* defaults - no need to change */
+#define MYSQL_VPORT 0
+#define MYSQL_DEFAULT_TABLE "vpopmail"
+#define MYSQL_DATABASE "vpopmail"
+#define MYSQL_DOT_CHAR '_'
+#define MYSQL_LARGE_USERS_TABLE "users"
+
+#ifdef MANY_DOMAINS
+#ifdef CLEAR_PASS
+#define TABLE_LAYOUT "pw_name char(32) not null, \
+pw_domain char(64) not NULL, \
+pw_passwd char(40), \
+pw_uid int, pw_gid int, \
+pw_gecos char(48), \
+pw_dir char(160), \
+pw_shell char(20), \
+pw_clear_passwd char(16), \
+primary key (pw_name, pw_domain ) "
+#else
+#define TABLE_LAYOUT "pw_name char(32) not null, \
+pw_domain char(64) not null,
+pw_passwd char(40), \
+pw_uid int, pw_gid int, \
+pw_gecos char(48), \
+pw_dir char(160),
+pw_shell char(20), \
+primary key (pw_name, pw_domain ) "
+#endif
+#else
+#ifdef CLEAR_PASS
+#define TABLE_LAYOUT "pw_name char(32) not null, \
+pw_passwd char(40), \
+pw_uid int, pw_gid int, \
+pw_gecos char(48), \
+pw_dir char(160), \
+pw_shell char(20), \
+pw_clear_passwd char(16), \
+primary key (pw_name ) "
+#else
+#define TABLE_LAYOUT "pw_name char(32) not null, \
+pw_passwd char(40), \
+pw_uid int, pw_gid int, \
+pw_gecos char(48), \
+pw_dir char(160), \
+pw_shell char(20), \
+primary key (pw_name ) "
+#endif
+#endif
+
+#define RELAY_TABLE_LAYOUT "ip_addr char(18) not null, \
+timestamp char(12), primary key (ip_addr)"
+
+#define LASTAUTH_TABLE_LAYOUT \
+"user char(32) NOT NULL, \
+domain char(64) NOT NULL,\
+remote_ip char(18) not null, \
+timestamp bigint default 0 NOT NULL, \
+primary key (user, domain)"
+
+char *vauth_munch_domain(char *);
+
+int vauth_adddomain_size(char *, int);
+int vauth_deldomain_size(char *, int);
+int vauth_adduser_size(char *, char *, char *, char *, char *, int, int);
+int vauth_deluser_size(char *, char *, int);
+int vauth_vpasswd_size( char *, char *, char *, int, int);
+int vauth_setquota_size( char *, char *, char *, int);
+struct vqpasswd *vauth_getpw_size(char *, char *, int);
+struct vqpasswd *vauth_user_size(char *, char *, char*, char *, int);
+struct vqpasswd *vauth_getall_size(char *, int, int, int);
+int vauth_setpw_size( struct vqpasswd *, char *, int);
+
+#ifdef MANY_DOMAINS
+#ifdef CLEAR_PASS
+#define INSERT "insert into %s \
+( pw_name, pw_domain, pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell \
+, pw_clear_passwd ) values ( \"%s\", \"%s\", \
+\"%s\", %d, 0, \"%s\", \"%s\", \"%s\" ,\"%s\" )"
+#else
+#define INSERT "insert into %s \
+( pw_name, pw_domain, pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell \
+) values ( \"%s\", \"%s\", \
+\"%s\", %d, 0, \"%s\", \"%s\", \"%s\" )"
+#endif
+#else
+#ifdef CLEAR_PASS
+#define INSERT "insert into %s \
+( pw_name, pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell \
+, pw_clear_passwd ) values ( \"%s\", \
+\"%s\", %d, 0, \"%s\", \"%s\", \"%s\" ,\"%s\" )"
+#else
+#define INSERT "insert into %s \
+( pw_name, pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell \
+ ) values ( \"%s\", \
+\"%s\", %d, 0, \"%s\", \"%s\", \"%s\" )"
+#endif
+#endif
+
+#ifdef MANY_DOMAINS
+#define DELETE_USER "delete from %s where pw_name = \"%s\" \
+and pw_domain = \"%s\" "
+#else
+#define DELETE_USER "delete from %s where pw_name = \"%s\" "
+#endif
+
+
+#ifdef MANY_DOMAINS
+#define SETQUOTA "update %s set pw_shell = \"%s\" where pw_name = \"%s\" \
+and pw_domain = \"%s\" "
+#else
+#define SETQUOTA "update %s set pw_shell = \"%s\" where pw_name = \"%s\" "
+#endif
+
+#ifdef MANY_DOMAINS
+#ifdef CLEAR_PASS
+#define USER_SELECT "select pw_name, pw_passwd, pw_uid, pw_gid, \
+pw_gecos, pw_dir, pw_shell , pw_clear_passwd \
+from %s where pw_name = \"%s\" and pw_domain = \"%s\" "
+#else
+#define USER_SELECT "select pw_name, pw_passwd, pw_uid, pw_gid, \
+pw_gecos, pw_dir, pw_shell \
+from %s where pw_name = \"%s\" and pw_domain = \"%s\" "
+#endif
+#else
+#ifdef CLEAR_PASS
+#define USER_SELECT "select pw_name, pw_passwd, pw_uid, pw_gid, \
+pw_gecos, pw_dir, pw_shell , pw_clear_passwd \
+from %s where pw_name = \"%s\" "
+#else
+#define USER_SELECT "select pw_name, pw_passwd, pw_uid, pw_gid, \
+pw_gecos, pw_dir, pw_shell \
+from %s where pw_name = \"%s\" "
+#endif
+#endif
+
+#ifdef MANY_DOMAINS
+#ifdef CLEAR_PASS
+#define GETALL "select pw_name, \
+pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell, \
+pw_clear_passwd from %s where pw_domain = \"%s\""
+#else
+#define GETALL "select pw_name, \
+pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell \
+from %s where pw_domain = \"%s\""
+#endif
+#else
+#ifdef CLEAR_PASS
+#define GETALL "select pw_name, \
+pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell, \
+pw_clear_passwd from %s"
+#else
+#define GETALL "select pw_name, \
+pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell from %s "
+#endif
+#endif
+
+#ifdef MANY_DOMAINS
+#ifdef CLEAR_PASS
+#define SETPW "update %s set pw_passwd = \"%s\", \
+pw_uid = %d, pw_gid = %d, pw_gecos = \"%s\", pw_dir = \"%s\", \
+pw_shell = \"%s\" \
+, pw_clear_passwd = \"%s\" \
+where pw_name = \"%s\" \
+and pw_domain = \"%s\" "
+#else
+#define SETPW "update %s set pw_passwd = \"%s\", \
+pw_uid = %d, pw_gid = %d, pw_gecos = \"%s\", pw_dir = \"%s\", \
+pw_shell = \"%s\" \
+where pw_name = \"%s\" \
+and pw_domain = \"%s\" "
+#endif
+#else
+#ifdef CLEAR_PASS
+#define SETPW "update %s set pw_passwd = \"%s\", \
+pw_uid = %d, pw_gid = %d, pw_gecos = \"%s\", pw_dir = \"%s\", \
+pw_shell = \"%s\" \
+, pw_clear_passwd = \"%s\" \
+where pw_name = \"%s\" "
+#else
+#define SETPW "update %s set pw_passwd = \"%s\", \
+pw_uid = %d, pw_gid = %d, pw_gecos = \"%s\", pw_dir = \"%s\", \
+pw_shell = \"%s\" \
+where pw_name = \"%s\" "
+#endif
+#endif
+
+#ifdef IP_ALIAS_DOMAINS
+#define IP_ALIAS_TABLE_LAYOUT "ip_addr char(18) not null, domain char(64), primary key(ip_addr)"
+#endif
+
+#define DIR_CONTROL_TABLE_LAYOUT "domain char(64) not null, cur_users int, \
+level_cur int, level_max int, \
+level_start0 int, level_start1 int, level_start2 int, \
+level_end0 int, level_end1 int, level_end2 int, \
+level_mod0 int, level_mod1 int, level_mod2 int, \
+level_index0 int , level_index1 int, level_index2 int, the_dir char(160), \
+primary key (domain) "
+
+#define DIR_CONTROL_SELECT "cur_users, \
+level_cur, level_max, \
+level_start0, level_start1, level_start2, \
+level_end0, level_end1, level_end2, \
+level_mod0, level_mod1, level_mod2, \
+level_index0, level_index1, level_index2, the_dir"
+
+#define VALIAS_TABLE_LAYOUT "alias char(32) not null, \
+domain char(64) not null, \
+valias_line char(160) not null, index (alias, domain)"
+
+#endif
+
+#ifdef ENABLE_MYSQL_LOGGING
+#define VLOG_TABLE_LAYOUT "id BIGINT PRIMARY KEY AUTO_INCREMENT, \
+ user char(32), passwd CHAR(32), \
+ domain CHAR(64), logon VARCHAR(200), \
+ remoteip char(18), message VARCHAR(255), \
+ timestamp bigint default 0 NOT NULL, error INT, \
+ INDEX user_idx (user), \
+ INDEX domain_idx (domain), INDEX remoteip_idx (remoteip), \
+ INDEX error_idx (error), INDEX message_idx (message)"
+#endif
+
Więcej informacji o liście dyskusyjnej pld-devel-pl