aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTimur I. Bakeyev <timur@FreeBSD.org>2008-05-01 13:06:37 +0000
committerTimur I. Bakeyev <timur@FreeBSD.org>2008-05-01 13:06:37 +0000
commit7fbfc3686f3d9a6b462817b427ae58776d4585a7 (patch)
tree7c6015c97f3ac53b6c514273e9f64805432245b0 /net
parent1967cc5c1782c7cc4a18c533d9b943e450f7d9db (diff)
downloadports-7fbfc3686f3d9a6b462817b427ae58776d4585a7.tar.gz
ports-7fbfc3686f3d9a6b462817b427ae58776d4585a7.zip
Notes
Diffstat (limited to 'net')
-rw-r--r--net/samba-pdbsql/Makefile9
-rw-r--r--net/samba-pdbsql/distinfo6
-rw-r--r--net/samba-pdbsql/files/patch-pdb_pgsql.c27
3 files changed, 33 insertions, 9 deletions
diff --git a/net/samba-pdbsql/Makefile b/net/samba-pdbsql/Makefile
index 929a31d34eca..b65cb9fdada7 100644
--- a/net/samba-pdbsql/Makefile
+++ b/net/samba-pdbsql/Makefile
@@ -6,27 +6,24 @@
#
PORTNAME= pdbsql
-PORTVERSION= 0.2
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= pdbsql
PKGNAMEPREFIX= samba-
-DISTNAME= ${PORTNAME}-${PORTVERSION}-${PKGNAMEPREFIX}${SAMBA_VERSION}
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= timur@FreeBSD.org
COMMENT= Multiplexor, MySQL and PostgeSQL passdb backends for Samba3
-BROKEN= Does not compile
-
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
# Add a build dependency for Samba port
USE_AUTOTOOLS= autoconf:261 autoheader:261
+WRKSRC= ${WRKDIR}/${DISTNAME}-samba
SAMBA_PORT= net/samba3
-SAMBA_VERSION= 3.0.23
OPTIONS= MYSQL "With MySQL passdb backend" on \
PGSQL "With PostgreSQL passdb backend" on
diff --git a/net/samba-pdbsql/distinfo b/net/samba-pdbsql/distinfo
index 5f40e799f068..2e92bc93c006 100644
--- a/net/samba-pdbsql/distinfo
+++ b/net/samba-pdbsql/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdbsql-0.2-samba-3.0.23.tar.bz2) = e2d1b65e1ae6097de58fa9709ca45ddc
-SHA256 (pdbsql-0.2-samba-3.0.23.tar.bz2) = 27ca8b8712df421691972b600ee7eaeb35285139c905539f1ef45a0765b236b0
-SIZE (pdbsql-0.2-samba-3.0.23.tar.bz2) = 69719
+MD5 (pdbsql-0.3.1.tar.bz2) = ff111de303d55c1a6777b48f1b963151
+SHA256 (pdbsql-0.3.1.tar.bz2) = db67ba994b7536f72d8674606670a9a59f41a24901322262891819d10e558938
+SIZE (pdbsql-0.3.1.tar.bz2) = 85554
diff --git a/net/samba-pdbsql/files/patch-pdb_pgsql.c b/net/samba-pdbsql/files/patch-pdb_pgsql.c
new file mode 100644
index 000000000000..318451ef0f58
--- /dev/null
+++ b/net/samba-pdbsql/files/patch-pdb_pgsql.c
@@ -0,0 +1,27 @@
+--- pdb_pgsql.c.orig 2008-05-01 12:30:43.000000000 +0200
++++ pdb_pgsql.c 2008-05-01 12:41:38.000000000 +0200
+@@ -164,7 +164,7 @@
+ pdb_set_profile_path (u, PQgetvalue(r, row, 13), PDB_SET);
+ pdb_set_acct_desc (u, PQgetvalue(r, row, 14), PDB_SET);
+ pdb_set_workstations (u, PQgetvalue(r, row, 15), PDB_SET);
+- pdb_set_commemt (u, PQgetvalue(r, row, 16), PDB_SET);
++ pdb_set_comment (u, PQgetvalue(r, row, 16), PDB_SET);
+ pdb_set_munged_dial (u, PQgetvalue(r, row, 17), PDB_SET);
+
+ pdb_set_acct_ctrl (u, PQgetlong (r, row, 23), PDB_SET);
+@@ -551,8 +551,13 @@
+ static NTSTATUS pgsqlsam_init (struct pdb_methods **pdb_method, const char *location)
+ {
+ NTSTATUS nt_status;
+- struct pdb_pgsql_data *data = malloc_p(struct pdb_pgsql_data);
+-
++ struct pdb_pgsql_data *data = malloc(sizeof(struct pdb_pgsql_data));
++
++ if (data == NULL) {
++ DEBUG(0, ("Can't allocate memory to data\n"));
++ return NT_STATUS_NO_MEMORY;
++ }
++
+ if (!NT_STATUS_IS_OK(nt_status = make_pdb_method(pdb_method))) {
+ return nt_status;
+ }