diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-12-17 07:17:54 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-12-17 07:17:54 +1100 |
| commit | 1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3 (patch) | |
| tree | cee337a9c93890605fb12490faec2a7f0b2188d8 /source4/lib | |
| parent | e294c4799bf6ad8da043aadf8341391644147056 (diff) | |
| parent | 54dc421f5820099531a77879f52a904c2fefcf49 (diff) | |
| download | samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.tar.gz samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.tar.bz2 samba-1b3a084d60cc0004f84bc56dedbe1d87cda2a8b3.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/ldb_wrap.c | 2 | ||||
| -rw-r--r-- | source4/lib/messaging/irpc.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c index 4a34c1c998..e290b851f3 100644 --- a/source4/lib/ldb/ldb_wrap.c +++ b/source4/lib/ldb/ldb_wrap.c @@ -2684,7 +2684,7 @@ SWIGINTERN ldb_dn *new_ldb_dn(ldb *ldb_ctx,char const *str){ we do it this way... */ talloc_steal(NULL, ret); - if (ret == NULL) + if (ret == NULL || !ldb_dn_validate(ret)) SWIG_exception(SWIG_ValueError, "unable to parse dn string"); fail: diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 65e98dce2c..3527f10648 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -23,6 +23,7 @@ #define IRPC_H #include "librpc/gen_ndr/irpc.h" +#include "librpc/gen_ndr/server_id.h" /* an incoming irpc message |