summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-08-24 21:49:10 +0000
committerJeremy Allison <jra@samba.org>1998-08-24 21:49:10 +0000
commit8afc9c80ac11649f06e5517d819dbf201c941acb (patch)
tree99823c267e34902aae622643b2e2fb412d5f846c /source3/smbd
parent0e877bd53bcffcaeab738610ca64c685c99f8263 (diff)
downloadsamba-8afc9c80ac11649f06e5517d819dbf201c941acb.tar.gz
samba-8afc9c80ac11649f06e5517d819dbf201c941acb.tar.bz2
samba-8afc9c80ac11649f06e5517d819dbf201c941acb.zip
Changed ASSERT macros to SMB_ASSERT macros as some systems already
have an ASSERT macro defined. Jeremy. (This used to be commit dbe6ad014a8b5dcbf17d7cd9865650c2e040d666)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/ipc.c2
-rw-r--r--source3/smbd/password.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 46fb6a22ff..70c2668d92 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -373,7 +373,7 @@ va_dcl
}
#if CHECK_TYPES
str = va_arg(args,char*);
- ASSERT(strncmp(str,p->curpos,strlen(str)) == 0);
+ SMB_ASSERT(strncmp(str,p->curpos,strlen(str)) == 0);
#endif
stringneeded = -1;
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 121ebb7f00..ecc86f29ec 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1191,8 +1191,8 @@ machine %s in domain %s.\n", global_myname, global_myworkgroup ));
trust_password_unlock();
/*
- * Here we should check the last change time to see if the machine
- * password needs changing..... TODO... JRA.
+ * Here we check the last change time to see if the machine
+ * password needs changing. JRA.
*/
if(time(NULL) > lct + lp_machine_password_timeout())