diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-04-21 11:38:20 +0400 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-04-21 11:38:20 +0400 |
| commit | ff615f232968979f57a31f43a4f668c2c4fd20df (patch) | |
| tree | 8e4d6e1181001dd35e32008a3401020c013e288b /source3/libads/ldap_printer.c | |
| parent | 09caab9f37d6ecd4fd6fe9ce3c284730b232651a (diff) | |
| parent | 0db7aba8af80a01150d1061a4192ab814e4234b7 (diff) | |
| download | samba-ff615f232968979f57a31f43a4f668c2c4fd20df.tar.gz samba-ff615f232968979f57a31f43a4f668c2c4fd20df.tar.bz2 samba-ff615f232968979f57a31f43a4f668c2c4fd20df.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a)
Diffstat (limited to 'source3/libads/ldap_printer.c')
| -rw-r--r-- | source3/libads/ldap_printer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c index 05fbc071d8..6682ec24d0 100644 --- a/source3/libads/ldap_printer.c +++ b/source3/libads/ldap_printer.c @@ -288,16 +288,15 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli, uint32 i; POLICY_HND pol; - asprintf(&servername, "\\\\%s", cli->cli->desthost); - asprintf(&printername, "%s\\%s", servername, printer); - if (!servername || !printername) { + if ((asprintf(&servername, "\\\\%s", cli->desthost) == -1) + || (asprintf(&printername, "%s\\%s", servername, printer) == -1)) { DEBUG(3, ("Insufficient memory\n")); return WERR_NOMEM; } result = rpccli_spoolss_open_printer_ex(cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, - servername, cli->cli->user_name, &pol); + servername, cli->user_name, &pol); if (!W_ERROR_IS_OK(result)) { DEBUG(3, ("Unable to open printer %s, error is %s.\n", printername, dos_errstr(result))); |