diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-13 15:00:48 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-13 15:00:48 -0800 |
| commit | e2eaf24f7b04984fd3ea0514c32b743e9ca479c9 (patch) | |
| tree | 62740b2e450357741fc0e4d35137731bad91372b /source3/groupdb/mapping_ldb.c | |
| parent | 8ab992524abf765f4cf18286d98e2ccd7bcae6af (diff) | |
| download | samba-e2eaf24f7b04984fd3ea0514c32b743e9ca479c9.tar.gz samba-e2eaf24f7b04984fd3ea0514c32b743e9ca479c9.tar.bz2 samba-e2eaf24f7b04984fd3ea0514c32b743e9ca479c9.zip | |
Remove all pstring from groupdb/
Jeremy.
(This used to be commit 6959c5c7e3e95604c66788b86d5789757e18cc36)
Diffstat (limited to 'source3/groupdb/mapping_ldb.c')
| -rw-r--r-- | source3/groupdb/mapping_ldb.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c index be1f1593fb..ab7ac0b913 100644 --- a/source3/groupdb/mapping_ldb.c +++ b/source3/groupdb/mapping_ldb.c @@ -618,8 +618,6 @@ static bool mapping_upgrade(const char *tdb_path) { static TDB_CONTEXT *tdb; int ret, status=0; - pstring old_path; - pstring new_path; tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDWR, 0600); if (tdb == NULL) goto failed; @@ -637,12 +635,17 @@ static bool mapping_upgrade(const char *tdb_path) tdb = NULL; } - pstrcpy(old_path, tdb_path); - pstrcpy(new_path, state_path("group_mapping.tdb.upgraded")); + { + const char *old_path = tdb_path; + char *new_path = state_path("group_mapping.tdb.upgraded"); - if (rename(old_path, new_path) != 0) { - DEBUG(0,("Failed to rename old group mapping database\n")); - goto failed; + if (!new_path) { + goto failed; + } + if (rename(old_path, new_path) != 0) { + DEBUG(0,("Failed to rename old group mapping database\n")); + goto failed; + } } return True; |