← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ntp/gutsy

« back to all changes in this revision

Viewing changes to ntpd/ntp_intres.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-05-18 22:41:56 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070518224156-563ruqxsxvqvoy8h
Tags: 1:4.2.4p0+dfsg-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Update version in conflicts/replaces to that which was shipped in edgy,
    which was later than that in Debian (due to the ubuntuX).
  - Change default server to ntp.ubuntu.com.
  - Remove stop links from rc0 and rc6
  - Call dh_installinit with --error-handler
  - Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ntpd/ntp_intres.c
249
249
        readconf(in, req_file);
250
250
        (void) fclose(in);
251
251
 
 
252
#ifdef DEBUG
252
253
        if (!debug )
 
254
#endif
253
255
                (void) unlink(req_file);
254
256
 
255
257
        /*
785
787
                }
786
788
                else if (n == 0)
787
789
                {
 
790
#ifdef DEBUG
788
791
                        if (debug)
789
792
                            msyslog(LOG_INFO, "select() returned 0.");
 
793
#endif
790
794
                        return 0;
791
795
                }
792
796
 
1055
1059
                }
1056
1060
 
1057
1061
                if ((intval[TOK_FLAGS] & ~(FLAG_AUTHENABLE | FLAG_PREFER |
1058
 
                    FLAG_NOSELECT | FLAG_BURST | FLAG_IBURST | FLAG_SKEY))
 
1062
                    FLAG_NOSELECT | FLAG_BURST | FLAG_IBURST | FLAG_SKEY | FLAG_DYNAMIC))
1059
1063
                    != 0) {
1060
1064
                        msyslog(LOG_ERR, "invalid flags (%ld) in file %s",
1061
1065
                                intval[TOK_FLAGS], name);
1075
1079
                    flags |= CONF_FLAG_IBURST;
1076
1080
                if (intval[TOK_FLAGS] & FLAG_SKEY)
1077
1081
                    flags |= CONF_FLAG_SKEY;
 
1082
                if (intval[TOK_FLAGS] & FLAG_DYNAMIC)
 
1083
                    flags |= CONF_FLAG_DYNAMIC;
1078
1084
 
1079
1085
                /*
1080
1086
                 * This is as good as we can check it.  Add it in.